Pull in latest global-jjb for maven-merge job fix