B2633 Coupon manager- Date issue
updated missing msg define in error status -6
small cleanup
Merge remote-tracking branch 'remotes/origin/B2633' into develop

Conflicts:
	catalog/admin/includes/applications/coupons/js/coupons.js.php