CB-6911 - Geolocation fails in iOS 8
Revert CB-6911 partially (keeping Info.plist key installation for iOS 8)
CB-7158 - Fix geolocation for ios 8

Signed-off-by: Shazron Abdullah <shazron@apache.org>
Merge remote-tracking branch 'upstream/master'