PLINK-268 improve annotations
Merge branch 'master' of github.com:picketlink/picketlink