NOJIRA:  Update the NOTICE file
[maven-release-plugin] prepare release WebProxyPortlet-2.0.0-M2
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch 'upstream/v2' into mymc