Merge change I4e036287 into eclair

* changes:
  update line test to expose some bug on SGX530 ed4