AMBARI-7189 - Views: failed to create view instance
Merge branch 'trunk' into branch-alerts-dev