TMDM-7974: Updated code to support old password.
Merge branch 'maintenance/5.6'