SWITCHYARD-2291 - One final approach to the job waiting issue and a fix
for a NPE if you cancel the build request dialog