Merge changes Ibe495cdc,I6f8e5745

* changes:
  Update DRT2 to reflect WebKit code movement
  Add extra error handling to DRT2 launcher script