Merge "blueprint for 2.1.5 deployment-handler"