Merge branch 'master' of github.com:apigee/proxy-dependency-maven-plugin