Merge "Revert "Add redis password parameter""