Test annotation @Addon -> @AddonDependency
Merge branch '2.0' into FORGE-988

Conflicts:
	addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java