Merged concurrent changes.

TODO

src/lib-sieve/cmd-redirect.c

src/lib-sieve/cmd-require.c

src/lib-sieve/ext-encoded-character.c

src/lib-sieve/ext-envelope.c

src/lib-sieve/plugins/body/tst-body.c

src/lib-sieve/plugins/imapflags/ext-imapflags-common.c

src/lib-sieve/plugins/include/cmd-import.c

src/lib-sieve/plugins/include/cmd-include.c

src/lib-sieve/plugins/include/ext-include-binary.c

src/lib-sieve/plugins/include/ext-include-variables.c

src/lib-sieve/plugins/regex/mcht-regex.c

src/lib-sieve/plugins/relational/ext-relational-common.c

src/lib-sieve/plugins/relational/mcht-count.c

src/lib-sieve/plugins/vacation/cmd-vacation.c

src/lib-sieve/plugins/variables/cmd-set.c

src/lib-sieve/plugins/variables/ext-variables-arguments.c

src/lib-sieve/plugins/variables/ext-variables-common.c

src/lib-sieve/plugins/variables/ext-variables-modifiers.c

src/lib-sieve/plugins/variables/ext-variables-operands.c