Merge pull request #1128 from jdaugherty/7.0.x #1155

Job	Run time
coreTests	24m 43s
functionalTests (requestmap)	2m 36s
functionalTests (putWithParams)	1m 40s
functionalTests (annotation)	2m 45s
functionalTests (misc)	2m 4s
functionalTests (basic)	2m 9s
functionalTests (bcrypt)	1m 46s
functionalTests (issue503)	2m 12s
functionalTests (static)	2m 7s
functionalTests (basicCacheUsers)	1m 55s
publish	1s
	43m 58s

Provide feedback