Bug 952985 - Context arguments broken due to optional list changes
Merge pull request #364 from smarterclayton/bug_952985_to_stage_fix_context_arguments

Merged by openshift-bot