merge: resolve dev branch conflicts, add compose_template guard
Incorporate remote bug fixes into slimmed instance_service.py: - Add tool_type.compose_template guard before render_compose_template Quality gates: py_compile pass
This commit is contained in: