Convert annotations to portlet 2.0 versions
Merge remote-tracking branch 'upstream/master'