Merge "Add redis password parameter"