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
White-space lint fix
Merge pull request #16198 from s0undt3ch/develop

White-space lint fix
Adding two new grains, one to show only the ipv4 addresses for each interface and another to show only the ipv6 address for each interface.