to Ray Merrill.

(cherry picked from commit 65e6185b)

(cherry picked from commit 823ab316)

(cherry picked from commit 4bb025de)

Conflicts:

	htdocs/lib/version.php

Conflicts:

	htdocs/lib/user.php

The former controls whether Mahara should send any e-mail. If set to false, Mahara will never send email. Good for setting up a test system when you don't want to muck around with users' email addresses to prevent sending.

The latter allows you to have all email emerging from the system sent to some other e-mail address instead of where it is aimed for.

Turns out my original query was dumb, though perfectly legal SQL. MySQL
couldn't handle the 'dumb' which is kinda surprising but there you go.

generation.

Institutions are strings, not numbers. Should've picked this up before.

one.

copy_artefacts_allowed.

copy_artefacts_allowed is unnecessary as it's only called if the copy
type is 'full', and there's now no way that you would want to fully
copy a block and not copy the artefacts inside it.

Some other API tidyups have been done - default_artefact_config has been
renamed to rewrite_blockinstance_config and had a method signature
change to be a bit more flexible.

The copyconfig field of the View object is gone too, no longer required.