Merge "Sonar fixes related to exceptions"

diff --cc cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index efe5503,acbcf55..8cb6ae0
--- 1/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
--- 2/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@@ -183,10 -174,9 +183,8 @@@ public class Config 
        public static final String AAF_COMPONENT = "aaf_component";
        public static final String AAF_CERT_IDS = "aaf_cert_ids";
        public static final String AAF_DEBUG_IDS = "aaf_debug_ids"; // comma delimited
 -      public static final String AAF_DEFAULT_VERSION = "2.0";
        public static final String AAF_DATA_DIR = "aaf_data_dir"; // AAF processes and Components only.
  
- 
-       
        public static final String GW_URL = "gw_url";
        public static final String CM_URL = "cm_url";
        public static final String CM_TRUSTED_CAS = "cm_trusted_cas";