Fix pep8 warnings
NXP-11678: Fix merge of fileSystemItem contribution "order" (if new order is not specified, keep old one)
NXP-11678: Format
Merge branch 'master' into 5.6.0