Comment 5 for bug 1779158

I have pushed another commit to this working branch (w/ master branch rebase) to implement the features described in bug #1800481 (import form templates). Includes release notes additions.