Merge.
Merge pull request #599 from julesstp/20734

Incident #: 20734 - Add Shipment
Fix bcrypt salt bug breaking 'Web Server' OAuth. Alphanumeric salt only.
Fix bcrypt salt bug breaking 'Web Server' OAuth. Alphanumeric salt only.
Issue #20265 Fix OAuth redirect bug when logging in. Finish dialog form.
swat
CSS tweaks
Merge pull request #639 from bendiy/20820

Issue #20265 Fix OAuth redirect bug when logging in.
Merging.