Revert r34559 and fix r34542 -- include rightclickedit.js for 'edit on right click...