Merge "Moving custom rpm packages to dev_dep_check"