propagate step 5 server.js fixes to step 6
propagate step 5 server.js fixes to step 6

GoogleCloudPlatform/gce-oreilly,GoogleCloudPlatform/gce-oreilly,GoogleCloudPlatform/gce-oreilly,GoogleCloudPlatform/gce-oreilly