merged EAP framework from branch into trunk

includes a lot of other modifications

src/starter/keywords.h

@@ -39,6 +39,7 @@ typedef enum {
     KW_NAT_TRAVERSAL,
     KW_KEEP_ALIVE,
     KW_VIRTUAL_PRIVATE,
+    KW_EAPDIR,
     KW_PKCS11MODULE,
     KW_PKCS11KEEPSTATE,
     KW_PKCS11PROXY,
@@ -67,6 +68,7 @@ typedef enum {
     KW_COMPRESS,
     KW_AUTH,
     KW_AUTHBY,
+    KW_EAP,
     KW_IKELIFETIME,
     KW_KEYLIFE,
     KW_REKEYMARGIN,