Update to new CLIntegracon Patch

mrackwitz/CLIntegracon#2 got fixed.

TODO:
* [ ] Fix regressions
* [ ] `rake spec:rebuild_integration_fixtures`