TBD-1207 : MongoDB 2.6.4 throwing invalid error after data commit is
completed when log4j is activated
Fix two issues related to Spark
Merge branch 'maintenance/5.6'