Fixes after code review, preparing for new PR.
Merge branch 'gce_master' of github.com:rybaktomasz/bootstrap-vz into gce_master