Merged concurrent changes.

TODO

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

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

src/lib-sieve/sieve-message.c

src/lib-sieve/sieve-message.h

src/lib-sieve/sieve-script.c

src/lib-sieve/sieve-script.h

src/lib-sieve/sieve.c

src/lib-sieve/sieve.h

src/plugins/lda-sieve/lda-sieve-plugin.c

src/sieve-bin/bin-common.c

src/testsuite/cmd-test-set.c

src/testsuite/testsuite-common.c

src/testsuite/testsuite-common.h

src/testsuite/testsuite-objects.c

src/testsuite/testsuite-objects.h

tests/extensions/body/basic.svtest

tests/extensions/include/errors.svtest

tests/extensions/include/errors/generic.sieve