TDI-31217 fixed: Define the Spark driver host option
Merge branch 'maintenance/5.6'