CXF-1054, or, Aegis by the boat

[Benson Margulies]

The big patch attached to CXF-1054 just passed a full test run. So I'd
recommend committing that rather than the littler patch attached to
1037.