fix trap plugin to prevent infinite loop
Merge pull request #1202 from tuff-ghost/issue_3380e

3380e: fix trap plugin to prevent infinite loop
3371 Fix JS on maintenance page where livequery is not included
Merge pull request #1203 from sarken/issue_3371

3371 Fix JS on maintenance page where livequery is not included