MERGE uoa-commons vocEncoding into trunk r24969:27891
copy of uoa-commons to start working on spring4