Simplify acceptance tests framework
Rename conflicting and dcs_* bundles and bodies
Redmine#4826: fix CRLFs and update plucked.cf.sub
Redmine#4826: move test_precheck to dcs.cf.sub
Merge pull request #1588 from tzz/test/simplify2

Redmine#4826: Simplify acceptance tests without rewriting existing tests more than necessary