Merge "iniset: fix handling of values containg ampersand"