AGPUSH-559 support custom truststore
Refactoring
Merge branch 'pr/37'
sys props need to be under extensions
Merge remote-tracking branch 'tolis-e/master'