TDI-30227: make sure the empty password to encrypt also.
Merge branch 'maintenance/5.6'