Merge "Fix warnings in neconf-util"