bring 1.5 ios extensions into line with pending 1.6 reorg. This should allow cleaner binary only builds. Still needs testing and cmake mods to match