Bug fixes

• #1677 - Metadata field keywords in simple edit layouts break Edit+ content templates
• #1679 - Email screen not appearing on Custom Forms in Edit+
• #1630 - File Upload question download links aren't urlencoded in Submission's detail screen