GERONIMODEVTOOLS-811 Merge revision r1360708-1478440 from eclipse-plugin trunk

git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/3.0@1486260 13f79535-47bb-0310-9956-ffa450edef68