MERGE uoa-commons vocEncoding into trunk r24969:27891
icm-enabling-aas-common and ehcache-spring-annotations
copy of uoa-commons to start working on spring4