Fix to location controller (pipeline changes)
Merge pull request #437 from jbeast/uat_location_fix

Fix to location controller (pipeline changes)