Merge "Revert "Update nonrtric jjb for the change of folder names in master branch""