Handle scl multi arg escaping a little better
Merge pull request #3532 from danmcp/master

Merged by openshift-bot