SWITCHYARD-2009

As discussed here: https://community.jboss.org/message/870119.
Also a pull request for core
You are making a comment on code I didn't write. :-)  This looks to be a comment on the code you initially submitted.  At least that's what GitHub is showing me with your comment.