Merge "[fuel] Improved IP handling on config template"