reverting back SDPII-160 changes from master branch
Merge branch 'master' into sprint4
SDPII-160 - User multiple department location mapping
Merge branch 'sprint4' of https://github.com/StrataLabs/service_desk into sprint4