Merge "Fix VNFSDK health check Heat"