Merge "add a paramter to control page-load-termination-on-JS-error"