minor fix on the apply-hotfixes.sh, 1/ added -n to git cherry-pick 2/ added -X no-renames