Merge "ubuntu-server-cloudimg-modify.sh: shellcheck fixes"