New keystores and truststores
Refactored
Merge branch 'master' of https://github.com/RichardSimko/EIT060