Normalize indentation, cleanup integration changes
Normalize indentation, cleanup integration changes

[#162669880](https://www.pivotaltracker.com/story/show/162669880)

Co-authored-by: Danny Berger <8efccf38e9d8f361e1973ad644e1b1e50ad8ecfe@pivotal.io>

gu-bin/bosh-agent,mattcui/bosh-agent,gu-bin/bosh-agent,cloudfoundry/bosh-agent,cloudfoundry/bosh-agent,gu-bin/bosh-agent,mattcui/bosh-agent,mattcui/bosh-agent