Skip lxc tests if no lxc and skip failing vt_test if running osx
Update salt for new remote attributes in Raet
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14378 from rallytime/test_cleanup

Skip lxc tests if no lxc and skip failing vt_test if running osx
Merge pull request #14381 from SmithSamuelM/sam_2014.7

Added consistent indexing access to remotes by uid, by name, and by ha
Needs Raet v0.2.05