Update for mac installer built script
Updated OSX mappings
fixed merge conflicts between next and hotfix1