Feature TDI-26799 added:Sort context properties file.
Merge branch 'maintenance/5.6'