Merge "Global jjb tag override for ONAP"