Revert "Revert "Use aws c4 and m4 instance types""
Revert "Revert "Use aws c4 and m4 instance types""

This reverts commit 12cc583f81c86c76d0c6b4f9facfb3c297cc9d0b.

Signed-off-by: Steve Taylor <2618d8eeb38db5666975df4fd945cc4512e3f384@pivotal.io>

cloudfoundry/cf-deployment,cloudfoundry/cf-deployment,emalm/cf-deployment