eb-7317: use case-insensitive sorting for manifest properties
Merge remote-tracking branch 'upstream/master'