OneEF: Fix issues with customizing reverse engineer code first templates
Merge branch 'release-6.1.0-beta1'