Fixes an issue where XCTest is missing in Xcode 6

Mergeable PR for https://github.com/CocoaPods/CocoaPods/pull/2298

Just cherry-picked @squarefrog's commit and fixed the small conflict in CHANGELOG.md