Merge branches 'master' and 'remove_grain_matchers' of github.com:BCCVL/BCCVL_Test_Environment into remove_grain_matchers
Remove salt and salt-minion from EPEL pkgs. This stops salt from updating beyond the git installed version=0.16.