Merge "Update global-jjb for Whitesource use in ONAP"