Cleaned up code for adding provider id
merged with master
Cleaned code for searching location and provider
merging akwatuha-MOB-29
MOB-29 - minor formatting changes, removed call to find provider id since we are using the person id anyways