Merge "[deployment_handler] Fix some nits and improve output"