Revert "Revert "Remove some deps leftovers & testsuite cleanup""

This reverts commit b05a7ff4d35cedc85d5ac82e611d44b5c7464f1e.
[WFLY-2556] Arquillian integration may break test deployments that have OSGi metadata