BZ1035267: Rule Template: Improve validation message when 'template data' is not filled out
(cherry picked from commit 61b9b0b11ca0f8747835284d68fbe29e0faf4458)
BZ1036806 - NPE when creating new project
(cherry picked from commit f72843f4a79cafe2b46a2f3a890db06e2741f8e1)