Merge changes I2998e40a,I03eacfa1

* changes:
  Partially revert argument escaping.
  Uniformly escape shell arguments.