Fixed Location forwarding

(includes changes through I24a56197)
Fix for massive client overhaul for webrtc
Location forwarding now works
Reformatted code that had wacky indentations

Change-Id: Ic8c6cf52e7604e8f0e97635c8e2b3f22087e8f85