Fixed update of tables with deleted entities
Merge branch 'manila' of https://github.com/NetApp/horizon into manila
Merge branch 'manila' of https://github.com/NetApp/horizon into manila
Refactoring project templates