Merge "Update jjb to build xtesting dockers in ONAP"