7.x 4.4 form wrapper restoration

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