Merge commit '1736f2ce6560a89acc8c21d573da96d76b75ec07' * commit '1736f2ce6560a89acc8c21d573da96d76b75ec07': BUG 2039647 : support customization from calling wrapper script.
Merge commit '1736f2ce6560a89acc8c21d573da96d76b75ec07' * commit '1736f2ce6560a89acc8c21d573da96d76b75ec07': BUG 2039647 : support customization from calling wrapper script.