tests/acceptance: use default_cf_sub_if_repaired
Reworked cf-serverd acceptance tests
Merge pull request #1508 from tzz/test/cf-serverd-test-fixes

Reworked cf-serverd acceptance tests