H, I just merged forward some commits that had been waiting on the upgrade paths PR [1]. There where conflicts but I think I solved them correctly. As far as I can tell the affected PRs where: https://github.com/apache/cloudstack/pull/2563 https://github.com/apache/cloudstack/pull/2567 https://github.com/apache/cloudstack/pull/2557
[1] https://github.com/apache/cloudstack/pull/2559 -- Daan