Merge "Require editsitecss/editsitejs for editing raw messages"