Merge patch faq_content.jsp from Chunkywizard.