ACTIVEMQ6-4 Fixing tests after package and classes renames

https://issues.apache.org/jira/browse/ACTIVEMQ6-4

this will include a few fixes for the tests including
hornetq-version renaming to activemq-version