Port universalOSX changes to dev/master

Port universalOSX changes to dev/master
Merge pull request #219 from AzureAD/port_from_univeral

Port universalOSX changes to dev/master
Merge pull request #220 from AzureAD/dev

Dev