STORM-252 Upgrade curator to 2.4.0

Currently this pull request also includes the code from STORM-70.  But they should go in as part of that JIRA.