central config for wsuri, realm, baseUri, some cleanup + little fixes
Merge remote-tracking branch 'origin/master'