Clean up formatting of master stock conf file
Clean up formatting of minion stock conf file
Merge pull request #16192 from rallytime/stock_conf

Touch up formatting in master/minion stock conf
Merge branch '2014.7' into develop

Conflicts:
	conf/master
	conf/minion