Add debug logging to help diagnose intermittent upgrade test failures.

Also fixed indentation in ElasticsearchMergePolicy.