Merge branch 'release-2.5' of github.com:azkaban/azkaban2

Conflicts:
	src/main/java/azkaban/webapp/AzkabanWebServer.java
Merge branch 'master' of github.com:azkaban/azkaban2 into release-2.5.1