SPARK-1071: Tidy logging strategy and use of log4j