Include integration tests in coverage reports

https://www.pivotaltracker.com/story/show/70476264
Merge branch 'develop' into feature/keystone-authentication