Merge branch 'users/amaverma/testDPhanges' into 'master'

updating key names to make code work against opendes tenant

See merge request !33
18 jobs for master in 36 minutes and 3 seconds (queued for 7 seconds)