saltstack/salt — pull request #18596 by cvrebert (2014-12-01 14:54:43+00:00)
Title: jboss7 & artifactory: fix builtins shadowing & convert Windows=>Unix newlines

FYI: @starzyk1