Mix of modifications for compatability with Private Cloud

Change-Id: I910c5572c529e0661ac1c53074792f086c94d488