NXP-11678: Fix merge of fileSystemItem contribution "order" (if new order is not specified, keep old one)
NXP-11678: Format