Reapply Switch mdsal to using new maven-merge job