CLOUDSTACK-7404: Fix to allow to start an instance when it's originating template has been deleted
Merge branch 'fix-upstream' of github.com:exoscale/cloudstack into fix-upstream