Add optional wrapping div around SwatFormField notes and contents.

This is controlled by a new $wrap_content_and_notes flag, and leads to a giant nested if block, but the logic is easiest to follow like this, and probably easier than the prior logic.
CS