DEVIDM-83 - javadoc
DEVIDM-83 - Reverted the package name change of annotation to annotations to avoid messing up the svc implementations.