Merge "Unhardcoded inject_* params in nova-compute.conf"