Revert emr specific retry delay function

Just use default randomization for now.
Add waiter for cluster running to emr
Merge branch 'emr-models' into develop

* emr-models:
  Add waiter for cluster running to emr
  Revert emr specific retry delay function