Merge branch 'Apache_master_07.19.2016_KSExpnBackoff' of github.com:hmcl/storm-apache