Revert part of  "Move defaults into spec files"

This reverts commit a087b1447d18b293c85ccbc4944a028d51aeb2a4.

Conflicts:
	jobs/cf-mysql-broker/spec