v2 service brokers use username/password instead of token for auth.

[#57183050]
Bumping to version 5.4.0.
Auto-merge remote-tracking branch 'upstream/master'