merge ca config and client config, remove old format of probe

Change-Id: I73500f532f166851d82c1bf1cc008c7ffc241ef3
diff --git a/ca.conf.sample b/ca.conf.sample
index 977005a..cdc2aab 100644
--- a/ca.conf.sample
+++ b/ca.conf.sample
@@ -1,8 +1,8 @@
 {
   "ca-prefix": "/example",
-  "issuing-freshness": "720",
-  "validity-period": "360",
   "ca-info": "An example NDNCERT CA",
+  "max-validity-period": "1296000",
+  "max-suffix-length": "2",
   "probe-parameters":
   [
     {"probe-parameter-key": "email"},