merged multi-auth branch back into trunk

testing/tests/ikev2/two-certs/posttest.dat

@@ -1,7 +1,6 @@
 moon::ipsec stop
 carol::ipsec stop
-dave::ipsec stop
 moon::/etc/init.d/iptables stop 2> /dev/null
 carol::/etc/init.d/iptables stop 2> /dev/null
-dave::/etc/init.d/iptables stop 2> /dev/null
-moon::rm /etc/ipsec.d/certs/*
+carol::rm /etc/ipsec.d/private/*
+carol::rm /etc/ipsec.d/certs/*