Adding changes to comply with the compat client.

partially implements blueprint cli-compliance-upgrade