Fix intermittent build issue by increasing timeout
Changed some padding and removing extra space after login name
Merge remote-tracking branch 'origin/master'