Merge branch 'release-6.0.4'
Should not depend on "$app->param" for detecting scope. bugid:112418
Reapply "fix_broken_trigger_cache" in order to reconstruct cache. bugid:112418
Add test for a trigger "blogs_in_website". bugid:112418
Merge branch 'fix/reapply-fix_broken_trigger_cache' into release-6.0.4-1
Bump up version number. bugid:112422
Merge branch 'release-6.0.4-1'
Should not use subdomain when multi-domain feature is enabled. bugid:112500
Merge branch 'c3' into develop