Use grace period instead of initial delay
Merge pull request #293 from mesosphere/grace-period

Use grace period instead of initial delay