STORM-596: rm defaults.yaml.orig Config.java.orig