Fixed patch apply conflicts.

Rebuilding patch to fix conflicts during apply.

In D315#6193, @erik wrote:

All works properly, but test plan may be corrected:
Part 1, 13 - may be "confirm, that in Console 3 messages about change event appeared (for 2 option checkboxes + select all itself)" - because by previous part of the plan 2 options were unchecked.

Second script in the preparations part may be fixed by removing first 3 symbols "$('", that are excessive and produces js error.

The deprecation notices are triggered only in Debug Mode. After talking with @erik over Skype we've found out that debug mode was disabled via debug_off cookie. Please review again.

After speaking with @erik it turned out, that System Log was disabled on his In-Portal install. So need to retest all over again.

In D314#6117, @erik wrote:

All right, but when upgrading from 5.1.x to 5.2.x with debugger enabled, got lot of error messages on all installation steps from 1st to 6th. Like "Table SystemLog doesn't exist"

I've updated test plan, because code was fine, but test plan had some copy/paste issues.

Need to specify 'direct_links' => false was the only reason tests have failed?