Fix two JavaScript issues
Correctly close the SimpleModal overlay with the escape key (see #5297)
Merge remote-tracking branch 'upstream/hotfix/3.0.4' into hotfix/3.0.4