TDI-30227: Unify the encryption password.

Also need merge on master.