Merge "blueprint for 3.0.0 deployment-handler"