remove drain from executor job
Merge remote-tracking branch 'origin/pr/9' into develop

Signed-off-by: Alex Suraci <asuraci@pivotallabs.com>