(cherry picked from commit 0e2e6995b7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/template/HypervisorTemplateAdapter.java
This makes setup/db/db/schema-421to430.sql same as in master branch. The
change is table view related and does not affect db at all. Making it same
as the version on master for sanity purposes.