Revert "Acceptance test for redmine 6568"

This reverts commit 361374bcb05e47f78e46c42e4a753a7e9ff71ef8.
Revert "Follow normal ordering also in common bundles"

This reverts commit e92efc5458117c4988ddb8c815c72a017bd5f981.

Autorun acceptance test in masterfiles started failing, can't
see any other commit that would have changed behavior here.