Merge duplicate function test_update_add_property()

test_update_add_property was defined twice, overriding
the previous definition. Merge the two implementations

Change-Id: Iaa52ec16f9c4d88040b72f6cda031cacd94a3756
Make Glance code base H201 compliant

Add Exception to all except without any specific exception
class so the code can be H201 compliant

Change-Id: Ibd09e69f70c76837c72023ae87cbbe75c5eb1276
Merge "Merge duplicate function test_update_add_property()"