Reinstate "use the diego edge cli in tests""

This reverts commit f6cfb099bccfba9df6b72fb47e2caeeaeef4119f.
allow the whetstone test to use a custom config

Signed-off-by: David Wadden <dwadden@pivotal.io>