Merge pull request #1196 from billgonemad/documentation-fix-1195 #1309

Job	Run time
coreTests	6h 5m 0s
functionalTests (issue503)	1m 5s
functionalTests (misc)	1m 44s
functionalTests (putWithParams)	1m 4s
functionalTests (static)	1m 43s
functionalTests (annotation)	1m 59s
functionalTests (bcrypt)	1m 36s
functionalTests (requestmap)	1m 59s
functionalTests (basic)	1m 53s
functionalTests (basicCacheUsers)	1m 52s
publish	0s
	6h 19m 55s

Provide feedback