[OS-BUILD PATCHv2 6/21] redhat/scripts: Update merge-subtrees.sh with new subtree location