Test for retcode
Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test
Fix lint
Merge branch 'cro-retcode_failure_test' into 2014.7