cherry picked from commit 1c18ea07948775b5b1b4e2d964836b757fc21fd9 and resolved merge conflict
Revert CB-6911 partially (keeping Info.plist key installation for iOS 8)

(cherry picked from commit 3bc05a423d064413d6d15e68e4f14417d823318c)
CB-7158 - Fix geolocation for ios 8

Signed-off-by: Shazron Abdullah <shazron@apache.org>
(cherry picked from commit 4102a332b0c6b0c3513370a4c030a32e46a51e10)