Updating from mine branch
Updating from mine branch.
Fixing "bad credentials" text BT#6516