added changes needed for sfa implementation
merge
merge
Merge branch 'master' of https://github.com/FITeagle/core.git

Conflicts:
	aaa/src/main/java/org/fiteagle/core/aaa/authentication/CertificateAuthority.java