Merge changes I1db699db,I049221e8

* changes:
  Fix and improve ArcTerminationActionFromAvrTest
  Fix and improve ArcInitiationActionFromAvrTest