Merge pull request #706 from Mossop/bug826080

Bug 826080 - New context-menu module applies the PageContext in cases where it shouldn't. r=@gozala(cherry picked from commit faee375caae180369c927f9c2e500ceee297463e)