Merging unstable into unstable20

SalesforceSDK project / unit test changes.