Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
Tidy up variable names.

Variables with _ in them are confusing, try to use clearer names.
Add mocked components to the enable list of components.

Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.

Fixes #3842
Merge pull request #1293 from kunit/2.3-cakeemail-wrap

Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
Merge pull request #1292 from openam/HtmlHelper

make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
Allow setting different type on scriptBlock
Allow setting different type on scriptStart + scriptEnd
Update return types.
Merge pull request #1289 from gilleswittenberg/master

Allow setting type attribute on script block tags
Ensure passing empty array to SmtpTransport::config() does not reset existing config.
Synced args and return value with AbstractTransport::config().

Fixes #3840
fix some domain translations and remove leftover true param from 1.x
unify "Are you sure you want to delete"
Merge pull request #1295 from cakephp/master-i18n-fixes

Master i18n fixes
Merge pull request #1294 from ADmad/2.3-bugfix-smtp

Ensure passing empty array to SmtpTransport::config() does not reset exi...
Fix docblock
Expand doc blocks.
Make CakeEmail::config() merge configuration.

This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.

Fixes #3848
enforce a better email wrapping to send valid emails
Fix: Incorrect model being used as Controller::$modelClass

We cannot be sure that Controller::$uses have not been iterated, so
reset the array to use the first value.
Throw exceptions when invalid permission keys are used.

Silently 'failing' to save permissions is bad, throw exceptions instead.

Fixes #3851