Changes required for Spring Insight on PCF 1.5.x

[dtillman]

This commit makes a number of changes which are required for
compatibility with Spring Insight on PCF 1.5.x.

[cfdreddbot]

Hey dtillman!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you've already signed the CLA.

[cgfrost]

Hi Dave, this looks good to me but could you update the pull request to remove the commented out code. If it's not needed I'd rather not have it there at all.

Thanks, Chris.

[dtillman]

Hi Chris,
I've removed the commented out old code!
Dave

[cgfrost]

Looks good, I think @nebhale want to have a chat with you before I merge it in though. I'm sure he will get in touch soon.

[cgfrost]

Hi Dave, I'm waiting to get the OK to merge this in but I'd like to keep it as ready as possible in the mean time. We're about to do a release and I want to avoid hold ups when it comes time to do it. So, with that in mind could you re-base on top of master and squash the pull request in to a single commit. While you are at it could you check the indentation hasn't changed. Rubocop will pull you up on it if it has during a bundle exec rake run. I've commented the code where it looks like it might of changed.

[cgfrost]

Indentation.

[cgfrost]

@dtillman Hi Dave, I'm OK now to merge this in and get it released once you have done the changes. Thanks, Chris.