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

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

Travis Build status icon should refer to correct branch.
Merge pull request #1565 from sylus/7.x-2.x

Updates for 2.x branch.
Update WetKit Bean for Issue #2377709 by natew: Wetkit bean highlight doesn't render correctly after upgrade