Merge "Adjust codebase for iniparser upgrade (4.x)" into tizen