NXP-11074: shorter top level folder names for the custom hierarchy example
Merge branch 'master' into 5.6.0