Adding changes to comply with the compat client.

partially implements blueprint cli-compliance-upgrade

Change-Id: Ib2af25313ee79cb60eb1b59d3928f1bc45ba1858