OS X: Fix Info.plist placement in a CFBundle

Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle.  Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
Merge branch 'master' into osx-CFBundle-info-plist

Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
Merge topic 'osx-CFBundle-info-plist'

e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist
149ce5db OS X: Fix Info.plist placement in a CFBundle
Merge branch 'osx-CFBundle-info-plist' into release
Merge branch 'release'