FS-5934 force_transfer_context not being honored if you happen to do an attended this patch makes perfect sense.

Conflicts:
	src/include/switch_types.h

FS-6250 fix regression from 7efeabbd, don't discrimiate against people that have s as the first character in their user names

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.

Pre-jessie versions of Debian's mk-build-deps tool rely on libraries
that do not correctly parse debian/control, so we have to clip it down
to a smaller subset of the format to build on e.g. wheezy.

Clean up the libpq autodection and make sure it functionswith both pg_config and pkg-config.

if you are installing into a non-FHS standard location such as what happens with RPMs from the Postgres yum repo, you will need to make sure pkg-config can fild the libpq.pc file.
example: export PKG_CONFIG_PATH=/usr/pgsql-9.3/lib/pkgconfig

you may also want to make sure your path can find pg_config
example: export PATH=/usr/pgsql-9.3/bin:$PATH

also merge bkw's typo aliases

Conflicts:
	support-d/.bashrc

./debian/util.sh build-all will do a number of builds in sequence or
parallel.  We now track if any of those builds fail to return a
.changes file and exit non-zero.

FS-6230 --resolve There was no NAT detection enabled on the calls, this patch will activate it explicitly when used with force-rport to avoid a similar problem with other users

Conflicts:
	src/mod/endpoints/mod_sofia/sofia.c

regression from 8f82979d using wrong values to calculate buffer size

Conflicts:
	src/mod/applications/mod_conference/mod_conference.c

Conflicts:
	src/mod/applications/mod_conference/mod_conference.c