Merge pull request #1561 from sylus/7.x-2.x

Updates for 1.x branch.
Merge pull request #1562 from sylus/7.x-2.x

Updates for 2.x branch.
Update WetKit Admin for Issue #2374839 by natew: Fixed Admin menu breaks all JS.