#6502: Disable toolbar collapse button.
#6492: Reset the height if it's set to the old default.
#6492: Update field_instances so default size is slightly larger.
#6492: Remove debugging code.
#6518: Media warning about video breaking out of columns.
Merge pull request #6570 from openscholar/6518-media_embed_warning

Media warning about video breaking out of columns.
Merge pull request #6564 from openscholar/6502-wysiwyg_tweaks

wysiwyg tweaks
no way to pass a FID here, this is the most foolproof way I can think to catch this should it happen