CG|JE: Take TeamCity user and password from env, general tidy up