salt-ssh 'grains' support for rosters and the master conf file
Merge remote-tracking branch 'panoptix/feature_add_grains_support_to_master_and_roster' into Just-Works-TM-2014.7