ISPN-3719 Clean up the subsystem dependencies and make sure we don't pull in any upstream duplicates

https://issues.jboss.org/browse/ISPN-3719