Return to opt-in system for CAT tests in acceptance_tests errand.

Add opt-in for:
- security-groups
- logging
- operator

Remove defunct diego options.