Update to new CLIntegracon Patch

mrackwitz/CLIntegracon#2 got fixed.

## TODO:
* [ ] Fix regressions
* [ ] `rake spec:rebuild_integration_fixtures`
Is it required for the migration to work that you _could_ have two subsequent saves here?