Merge "get-occ-config.sh replace deprecated heat commands"