merge MMcM: Standardize and improve logging from join enumerator.

Merge pull request #1238 from MMcM/sql-layer/dphyp-logging
https://github.com/FoundationDB/sql-layer/pull/1238
Pull out a subclass so it can be used elsewhere.
Move non-group join conditions as well when possible.
Adjust some expected results.