GCE related fixes for shutdown and user-data