One final push to get layers ordered correctly

- Somehow plone.testing layers (or something) isn't being constructed
  and then deconstructed in symmetric order, resulting in highly
  unpredictable failure modes depending on how/when tests are invocated
  with other tests.  This hopefully fixes that mess.