Switchyard 2162

This needs to be pushed after 2133. Please let me know after that push and I can rebase.

The deltaspike upgrade is needed because of this:
https://issues.apache.org/jira/browse/DELTASPIKE-385