Revert "Remove unused code"

This reverts commit bd458dbe.

Reason for revert: Build failures
- https://osm.etsi.org/jenkins/job/NBI-stage_2-merge/job/master/509/
- https://osm.etsi.org/jenkins/job/osmclient-stage_2-merge/job/master/385/



Change-Id: I271aa7111db3ce8090269627da102788d9324c28
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>