Merge pull request #1271 from skim1420/fgb2

adds confdef/confold flags to dist-upgrade

install/first_google_boot.sh

@@ -417,10 +417,10 @@ fi
 # This can take several minutes so we are performing it at the end after
 # spinnaker has already started and is available.
 
-export DEBIAN_FRONTEND=noninteractive
 apt-mark hold $SPINNAKER_SUBSYSTEMS
 apt-get -y update
 apt-get -y dist-upgrade
+DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y dist-upgrade
 apt-mark unhold $SPINNAKER_SUBSYSTEMS
 
 if [[ -f /opt/spinnaker/cassandra/SPINNAKER_INSTALLED_CASSANDRA ]]; then