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

Updates for 2.x branch.
Update WetKit Widgets for Fix for media + file entity schema issue.