Replace ; by newlines when upgrading custom_options from unbound packages, it's related to ticket #4090
Simplify logic using a proper function as spotted by Ermal
Merge remote-tracking branch 'upstream/master'