Merge "Make apt-get upgrade non-interactive for configuration"