TDI-31037 : Password Context generate an error in log4j
Merge branch 'maintenance/5.6'