SWITCHYARD-1302 update deploy.xml to use switchyard service qnames

https://issues.jboss.org/browse/SWITCHYARD-1302

also changes to components