Merge pull request #5006 from JoeSubbiani/CleanCompat.sh2_dev

clean up compat.sh