Upgrade glib2 to upstream version 2.42.1

Merge and conflict resolution

[endlessm/eos-shell#2376]