Update project format from the old XML using Xcode 6.1

Xcode 6.x will modify the format of the project files, so unless we update its format all new pull request will have conflicts.
Fix a unit test which fails when run with Xcode6 (at least on an iOS8 simulator).  It looks like the internal HTTP NSURLProtocol returns NO from canInitWithRequest: if the URL has invalid characters like this, meaning no NSURLProtocols match it, and we get an NSURLErrorUnsupportedURL instead of NSURLErrorBadURL.  So, accept either error code.   Also changed some local variable types to avoid compiler warning.
Use expect matchers per PR request
Merge pull request #2072 from carllindberg/FixUnitTestIOS8

Fix a unit test which fails when run with Xcode6 / iOS8
Merge pull request #2058 from rivera-ernesto/update_project_format

Update project format from the old XML using Xcode 6.1 (5.x-compatible)