Bug 448624 - Partial manifest recovery mechanism while generating
deployment plans
Merge branch 'master' into ah-Bug444501