7.x 4.3 form wrapper restoration

This is a pull request that merges SB-themes 4.3 with the form-wrapper-restoration branch.