Revert "Revert "Switch login job to look at uaa.login.client_secret only""

This reverts commit 7670aac08d3e205e7a58ce75edc2511c21a00aaf.
Revert "Merge remote-tracking branch 'origin/pr/498' into develop"

This reverts commit d181b36c2a4cdfbd706815b9a7882dc10759cb53, reversing
changes made to df0a4224a718d8faba2f0cf9d840110bb7fb987f.