Fixed button/toolbar configuration for TinyMCE 4.0 while retaining legacy version support. Modified the upgrade method to ensure deprecated options fields are upgraded.