[B1511] updated for auto height issue on product edit page.
more updates
fixed
Merge remote-tracking branch 'remotes/origin/B1511' into develop

Conflicts:
	catalog/admin/includes/applications/products/pages/tabs/content.php