SDPII-177 - changing delete to disable function in locations
Merge branch 'sprint6' of https://github.com/StrataLabs/service_desk into sprint6