[OS-BUILD PATCH 5/20] redhat/scripts: Update merge-subtrees.sh with new subtree location