#3483 fixed conditionals
#3483 clean up a console.log
#3483 solved weird conflict
Merge pull request #3490 from dotCMS/issue-3483-content-context-menu

Issue 3483 fixed content context menu