Strip() vault password file
strip() vault password file
Merge pull request #6681 from zytek/devel

Properly revert changes introduced in #6579