SWITCHYARD-2009

As discussed here: https://community.jboss.org/message/870119.
Also a pull request for core