Merge "Bug 550466 - Drop Shell editor modules"