Remove rhq-pluginAnnotations-3.0.4.jar

Fixes EUCA-9915
Merge branch 'maint/4.0/testing' into testing