Check edition can have orgs on conflict page (squash into cd185ce)
Overhaul admin/supporting_pages_controller test

Now that supporting pages are editions we are just inheriting shared
edition controller behaviour so we only need a very reduced set of
tests.