Merge pull request #467 from khawkins/unstable

Mobile SDK: Merging master into unstable
Adding missing SmartSync tests to iOS hybrid testing
Merge pull request #468 from khawkins/master

Adding missing SmartSync tests to iOS hybrid testing
Merge remote-tracking branch 'upstream/master' into unstable