Fix prompt of type 'password' to prevent empty password
WAR: prevent remote and local build from reporting elapsed time twice
WAR: sh* load of changes