Conflicts: engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> This closes #529