some fixes
Merge branch 'google-cpi' of github.com:Altoros/bosh into google-cpi