refs #587 - fixed freemarker template for generating screen part aspect
refs #587 - fixed test
Merge branch 'FB_587_ENUM_IN_SCREEN_PART'