Merge "Move cert params to map.jinja"