Issue 4093: Ensure FAQ urls contain language id
Merge pull request #1852 from elzj/faq_urls

Issue 4093: Ensure FAQ urls contain language id