Merge "fix incorrect reference to rabbit_username"