CONN-53 subtask CONN-145: WIP - sharing with Landis.
Merge remote-tracking branch 'msweaver/master'
Some env cleanup and dependency mgmt stuff for gf provided JSF
CONN-148: Added Trust Store Manager.