Merge changes from topic "XfrmControllerTestCleanup"

* changes:
  Style cleanup in XfrmControllerTest
  Add IPv6 tests to XfrmControllerTest.