Merge "New JJB files for addon-onap project"