Merge branch 'feature-xml_dependency_fix' into 'develop'

Feature xml dependency fix

See commits :) ~ we've been packaging 2 dependencies that are required only for testing in our JAR files. This should fix that.

See merge request !32