[JENKINS-20599] Massaging the code and bumping tap4j dep version