Added password support for dump restore
Resolved merge conflicts