FS-5888 --resolve Rather than changing the default behavior I've updated the log line to be more accurate. Also fixed the problem where the delay was being overwritten.
FS-6250 fix regression from 7efeabbd88e81ee368de6ced32fed06c8035097b, don't discrimiate against people that have s as the first character in their user names
FS-6272 --resolve

Conflicts:
	src/include/switch_types.h
FS-5934 force_transfer_context not being honored if you happen to do an attended this patch makes perfect sense.
Prevent sqlite from over-reading a structure

Our sqlite fork was reading past the end of the zP3 KeyInfo structure
here.  This was causing gcc and clang's address sanitization to alert.

FS-6279 --resolve

Thanks-to: Christopher Rienzo <chris@rienzo.net>