change DEA evacuation bail out time to 6 minutes
remove legacy directory server

[finishes #61846108]

Signed-off-by: Ruth Byers <rbyers@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'