Fix test assertions & test cases for V2 Shell Unit test

Fixes bug 1195674

Change-Id: I46c10040ea10415498dd1eed69e45139cfa37eb4
Merge "Fix test assertions & test cases for V2 Shell Unit test"
Changes to allow image upload with V2 api

Related to bp glance-client-v2

Change-Id: I72a1d2825dd5c1ff4890e8be477cb4447d59f136
Merge "Changes to allow image upload with V2 api"