Merge "Improve cluster test app logging"