updated config
cleaned up trust manager registration
Merge origin/master