XD-1023: Simplify JobDeploy method signature

XD-1008: Add job instance awareness

Fix filing test by requirring pre-deploy
XD-995: Use matcher and hence eventually()