Tag build swift-4.0-DEVELOPMENT-SNAPSHOT-2017-06-01-a
Propagating prior merge from 'llvm.org/release_40'.