Merge "fix(fconf): make struct fconf_populator static" into integration