UHM-1575: Add Location hierarchy for CDI
UHM-1575: Add Location hierarchy for CDI
Modify default location deploy handler so as not to blow away any existing attributes