fixed bad merge
Merge branch 'jetty-9.1' into release-9.1
[maven-release-plugin] prepare release jetty-9.1.0.RC1
[maven-release-plugin] prepare for next development iteration