* upstream/master: (36 commits)
  Remove errant whitespace
  9GB sparse disk image to accommodate 10.15.4
  updated docs
  installmacos.py: install_product: set CM_BUILD
  Fix bad indent from #27. Addresses #34 and #35.
  Check if root after processing args
  Add Catalina sucatalog
  In os_installer_product_info better handle the failure to find a server metadata file for a macos product
  Update README.md
  Update README.md
  Work around a very dumb Apple bug in a package postinstall script.
  Fix to add SeedProgram extended attribute to the install application if --seedprogram option is used
  Don't attempt to parse a dist we could not replicate! Addresses #19.
  Add plistlib wrapper functions to avoid DeprecationWarnings under Python 3
  Some post-2to3-conversion cleanup
  Attempt #2 to add Python 3 compatibility
  Revert Python 3 changes as they relied on a non-standard module.
  Revert Python 3 chnages since they relied on a non-standard module.
  A few post-2to3 optimizations
  Add Python 3 support to installinstallmacos.py
  ...

* 'master' of https://github.com/munki/macadmin-scripts:
  Catch IOError exception when trying to read the SeedCatalogs.plist; print any errors around SeedCatalogs.plist access to stderr.
  Update README.md
  Bump sparseimage size to 16g; eliminate extra whitespace

# Conflicts:
#	installinstallmacos.py

* 'master' of https://github.com/munki/macadmin-scripts:
  Catch IOError exception when trying to read the SeedCatalogs.plist; print any errors around SeedCatalogs.plist access to stderr.
  Update README.md
  Bump sparseimage size to 16g; eliminate extra whitespace

# Conflicts:
#	installinstallmacos.py