SDPII-177 - changes for departments, locations
Merge branch 'sprint6' of https://github.com/StrataLabs/service_desk into sprint6