Client setup updates

Change-Id: I785f0adbabf8fdf04c550df78f79632fdace4b54
Merge branch 'nova-clean' into dt-test