Fix NPEs by using fixEmptyAndTrim instead of fixEmpty().trim()
Encode empty password as null.
Reinstated timeout configuration support.

Restored a couple of patches which were lost after an earlier merge.
Timeout was originally merged in at commit 973453bf17c802deb3c31093fde9b6058160785f
Restored JazzConfiguration copy constructor from commit 7e1b287fe841a369ddec374d87212ce477d496a1
Restored (+ updated) JazzConfigurationTests.