Merge branch 'dsuch-f-gh235-add-html-service'
Don't reset password on Edit.
Merge branch 'master' into dsuch-f-gh289-tls-validate-server-certs