Refactor catkin_make_isolated's plain cmake pkgs

Still needs:

- [ ] Code review
- [ ] Integration of test workspace into automated tests