Ensure common bundle convergence, acceptance test, Close #5222

This ensures that common bundles are converged (variable resolution) before
other types of bundles, and that promise types within common bundles
are converged in normal order.