various client/server fixes
remove hard-coded bootstrap address
Merge branch 'master' into release