Revert "Merge branch 'unstable' into wenfei"

This reverts commit c2f6cee29ea0e0da692982685f809ab57efce8d1, reversing
changes made to 569d822f1d1849adf50e1d2f77eda936a8444391.

	deleted:    lib/ant-doxygen/AUTHORS
	deleted:    lib/ant-doxygen/LICENSE
	deleted:    lib/ant-doxygen/PATCH-added-by-Ari-Fogel
	deleted:    lib/ant-doxygen/ant_doxygen.jar
	new file:   lib/antlr/LICENSE
	new file:   lib/antlr/antlr-3.4-complete.jar
	new file:   lib/commons/commons-cli-1.2.jar
	deleted:    lib/commons/commons-cli-1.3-SNAPSHOT.jar
	deleted:    lib/log4j/LICENSE.txt
	deleted:    lib/log4j/log4j-api-2.1.jar
	deleted:    lib/log4j/log4j-core-2.1.jar
	modified:   projects/batfish/.classpath
	modified:   projects/batfish/.externalToolBuilders/ant_eclipse_pre_compile.launch
	new file:   projects/batfish/.externalToolBuilders/org.eclipse.xtext.ui.shared.xtextBuilder.launch
	modified:   projects/batfish/.gitignore
	modified:   projects/batfish/.project
	deleted:    projects/batfish/ant-doxygen
	modified:   projects/batfish/build.xml
	modified:   projects/batfish/cygwin-replace-symlinks
	modified:   projects/batfish/cygwin-restore-symlinks
	deleted:    projects/batfish/doxygen.cfg
	new file:   projects/batfish/lib/antlr/LICENSE
	new file:   projects/batfish/lib/antlr/antlr-3.4-complete.jar
	new file:   projects/batfish/lib/commons/commons-cli-1.2.jar
	deleted:    projects/batfish/lib/commons/commons-cli-1.3-SNAPSHOT.jar
	deleted:    projects/batfish/lib/log4j/LICENSE.txt
	deleted:    projects/batfish/lib/log4j/log4j-api-2.1.jar
	deleted:    projects/batfish/lib/log4j/log4j-core-2.1.jar
	deleted:    projects/batfish/src/batfish/collections/NodeRoleMap.java
	modified:   projects/batfish/src/batfish/collections/NodeSet.java
	deleted:    projects/batfish/src/batfish/collections/RoleNodeMap.java
	deleted:    projects/batfish/src/batfish/collections/RoleSet.java
	modified:   projects/batfish/src/batfish/grammar/BatfishCombinedParser.java
	modified:   projects/batfish/src/batfish/grammar/BatfishLexerErrorListener.java
	modified:   projects/batfish/src/batfish/grammar/BatfishParserErrorListener.java
	new file:   projects/batfish/src/batfish/grammar/ConfigurationLexer.java
	new file:   projects/batfish/src/batfish/grammar/ConfigurationParser.java
	modified:   projects/batfish/src/batfish/grammar/ControlPlaneExtractor.java
	modified:   projects/batfish/src/batfish/grammar/ParseTreePrettyPrinter.java
	new file:   projects/batfish/src/batfish/grammar/TopologyLexer.java
	new file:   projects/batfish/src/batfish/grammar/TopologyParser.java
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoCombinedParser.java
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammar.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammarCommonLexer.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammarCommonParser.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammar_acl.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammar_bgp.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/CiscoGrammar_interface.g4
	modified:   projects/batfish/src/batfish/grammar/cisco/controlplane/CiscoControlPlaneExtractor.java
	modified:   projects/batfish/src/batfish/grammar/cisco/controlplane/CiscoControlPlanePrinter.java
	modified:   projects/batfish/src/batfish/grammar/cisco/controlplane/CiscoControlPlaneSensitiveDataCollector.java
	modified:   projects/batfish/src/batfish/grammar/cisco/controlplane/CiscoControlPlaneStripper.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/ConfigurationBuilder.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperControlPlaneExtractor.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammarCommonParser.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammarLexer.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammarParser.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_bgp.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_firewall.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_interfaces.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_isis.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_mpls.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_ospf.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_policy_options.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/FlatJuniperGrammar_routing_instances.g4
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/GroupApplicator.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/GroupPruner.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/HierachyBuilder.java
	deleted:    projects/batfish/src/batfish/grammar/flatjuniper/Hierarchy.java
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperConfiguration.java
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_bgp.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_firewall.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_interface.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_ospf.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_policy_options.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatJuniperGrammar_routing_options.g
	new file:   projects/batfish/src/batfish/grammar/juniper/FlatProtocolsStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/HostNameSysStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/JStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/JStanzaType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperConfiguration.java
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperControlPlaneExtractor.java
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammarCombinedParser.java
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammarCommonParser.g4
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammarLexer.g4
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammarParser.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_bgp.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_bgp.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_firewall.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_firewall.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_interface.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_interface.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_ospf.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_ospf.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_policy_options.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_policy_options.g4
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_protocols.g4
	modified:   projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_routing_options.g
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_routing_options.g4
	deleted:    projects/batfish/src/batfish/grammar/juniper/JuniperGrammar_system.g4
	new file:   projects/batfish/src/batfish/grammar/juniper/Lexer.java
	new file:   projects/batfish/src/batfish/grammar/juniper/NullJStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/NullPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/NullSysStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/PStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/PType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ProtocolsStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/SysStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/SysStanzaType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/SystemStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/BGPPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/BPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/BPType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/ClusterGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/ExportGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/ExportNGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/FamilyGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/FlatBGPPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/FlatGroupBPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/FlatNeighborGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/GBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/GBType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/GroupBPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/ImportGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/ImportNGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/LocalASGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/LocalASNGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/LocalAddressGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NGBType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NeighborGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NullBPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NullGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/NullNGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/PeerASGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/PeerASNGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/bgp/TypeGBStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/DestinationAddressFromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/DestinationPortFromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FilterFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FireWallStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FlatFilterFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FlatFireWallStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/FromTFFType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/ProtocolFromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/SourceAddressFromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/SourcePortFromTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/TermFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/ThenTFFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/firewall/ThenTFFType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/AddressFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/DisableIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FamilyType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FamilyUIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FamilyUType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FilterFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FlatFamilyUIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FlatInterfacesStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/FlatUnitIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/IFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/IFType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/InterfaceModeFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/InterfaceStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/InterfacesStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/NativeVlanIdFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/NativeVlanIdIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/NullFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/NullIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/UnitIFStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/VlanIdFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/interfaces/VlanIdListFamilyUStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/AOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/AOPType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/AreaOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/ExportOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/FlatAreaOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/FlatOSPFPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/InterfaceAOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/NullAOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/NullOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/OPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/OPType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/OSPFPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/ospf/ReferenceBandwidthOPStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/ASPathFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/ASPathPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/AcceptThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/CommunityAddThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/CommunityDeleteThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/CommunityFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/CommunityPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/CommunitySetThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FlatPolicyOptionsStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FlatPolicyStatementPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FlatPrefixListPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FlatTermPSPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/FromType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/IPv6FromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/LocalPreferenceThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/MetricThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/NeighborFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/NextHopThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/NullFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/NullPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/NullThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/POStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/POType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/PolicyOptionsStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/PolicyStatementPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/PrefixListFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/PrefixListPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/ProtocolFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/RejectThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/RouteFilterFromTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/TermPSPOStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/ThenTPSStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/policy_options/ThenType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/AutonomousSystemROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/FlatGenerateROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/FlatRoutingOptionsStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/GenerateROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/NullRGStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/NullROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/PolicyRGStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/RGStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/RGType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/ROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/ROType.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/RouteGROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/RouterIDROStanza.java
	new file:   projects/batfish/src/batfish/grammar/juniper/routing_options/RoutingOptionsStanza.java
	renamed:    projects/batfish/src/batfish/representation/juniper/SubnetOps.java -> projects/batfish/src/batfish/grammar/juniper/routing_options/StaticROStanza.java
	modified:   projects/batfish/src/batfish/grammar/logicblox/LogiQLCombinedParser.java
	modified:   projects/batfish/src/batfish/grammar/topology/BatfishTopologyCombinedParser.java
	modified:   projects/batfish/src/batfish/grammar/topology/GNS3TopologyCombinedParser.java
	deleted:    projects/batfish/src/batfish/grammar/topology/RoleCombinedParser.java
	deleted:    projects/batfish/src/batfish/grammar/topology/RoleExtractor.java
	deleted:    projects/batfish/src/batfish/grammar/topology/RoleLexer.g4
	deleted:    projects/batfish/src/batfish/grammar/topology/RoleParser.g4
	modified:   projects/batfish/src/batfish/grammar/z3/ConcretizerQueryResultCombinedParser.java
	modified:   projects/batfish/src/batfish/grammar/z3/ConcretizerQueryResultExtractor.java
	modified:   projects/batfish/src/batfish/grammar/z3/ConcretizerQueryResultLexer.g4
	modified:   projects/batfish/src/batfish/grammar/z3/ConcretizerQueryResultParser.g4
	modified:   projects/batfish/src/batfish/grammar/z3/DatalogQueryResultCombinedParser.java
	modified:   projects/batfish/src/batfish/logic/libbatfish/Bgp.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/BgpAdvertisement.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/BgpAdvertisement_rules.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/Bgp_rules.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/DataPlane_rules.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/Node.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/Route_rules.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/Traffic.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/Traffic_rules.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/service_config.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/service_files.logic
	modified:   projects/batfish/src/batfish/logic/libbatfish/service_init.logic
	modified:   projects/batfish/src/batfish/logicblox/ConfigurationFactExtractor.java
	modified:   projects/batfish/src/batfish/logicblox/EntityTable.java
	modified:   projects/batfish/src/batfish/logicblox/Facts.java
	modified:   projects/batfish/src/batfish/main/Batfish.java
	modified:   projects/batfish/src/batfish/main/BatfishException.java
	deleted:    projects/batfish/src/batfish/main/PedanticBatfishException.java
	modified:   projects/batfish/src/batfish/main/Settings.java
	modified:   projects/batfish/src/batfish/representation/BgpNeighbor.java
	modified:   projects/batfish/src/batfish/representation/BgpProcess.java
	modified:   projects/batfish/src/batfish/representation/CommunityList.java
	modified:   projects/batfish/src/batfish/representation/Configuration.java
	modified:   projects/batfish/src/batfish/representation/PolicyMap.java
	modified:   projects/batfish/src/batfish/representation/PolicyMapMatchIpAccessListLine.java
	modified:   projects/batfish/src/batfish/representation/Protocol.java
	modified:   projects/batfish/src/batfish/representation/VendorConfiguration.java
	modified:   projects/batfish/src/batfish/representation/cisco/BgpPeerGroup.java
	new file:   projects/batfish/src/batfish/representation/cisco/BgpPeerTemplatePeerGroup.java
	modified:   projects/batfish/src/batfish/representation/cisco/BgpProcess.java
	modified:   projects/batfish/src/batfish/representation/cisco/CiscoConfiguration.java
	modified:   projects/batfish/src/batfish/representation/cisco/CiscoVendorConfiguration.java
	deleted:    projects/batfish/src/batfish/representation/cisco/DynamicBgpPeerGroup.java
	modified:   projects/batfish/src/batfish/representation/cisco/Interface.java
	modified:   projects/batfish/src/batfish/representation/cisco/IpBgpPeerGroup.java
	deleted:    projects/batfish/src/batfish/representation/cisco/Ipv6BgpPeerGroup.java
	deleted:    projects/batfish/src/batfish/representation/cisco/MasterBgpPeerGroup.java
	modified:   projects/batfish/src/batfish/representation/cisco/NamedBgpPeerGroup.java
	modified:   projects/batfish/src/batfish/representation/cisco/PrefixList.java
	modified:   projects/batfish/src/batfish/representation/juniper/ASPathAccessList.java
	new file:   projects/batfish/src/batfish/representation/juniper/ASPathAccessListLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/BGPExportList.java
	deleted:    projects/batfish/src/batfish/representation/juniper/BGPFamily.java
	deleted:    projects/batfish/src/batfish/representation/juniper/BGPImportList.java
	deleted:    projects/batfish/src/batfish/representation/juniper/BGPLocalAddress.java
	modified:   projects/batfish/src/batfish/representation/juniper/BGPNeighbor.java
	deleted:    projects/batfish/src/batfish/representation/juniper/BGPPeerAS.java
	deleted:    projects/batfish/src/batfish/representation/juniper/CommunityMemberList.java
	deleted:    projects/batfish/src/batfish/representation/juniper/CommunityMemberListLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/ExpandedCommunityList.java
	new file:   projects/batfish/src/batfish/representation/juniper/ExpandedCommunityListLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/ExtendedAccessListTerm.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FamilyOps.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FamilyType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatchType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch_AddressMask.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch_Null.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch_PrefixLengthRange.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch_Through.java
	deleted:    projects/batfish/src/batfish/representation/juniper/FilterMatch_UpTo.java
	deleted:    projects/batfish/src/batfish/representation/juniper/Group.java
	deleted:    projects/batfish/src/batfish/representation/juniper/JuniperConfiguration.java
	modified:   projects/batfish/src/batfish/representation/juniper/JuniperVendorConfiguration.java
	deleted:    projects/batfish/src/batfish/representation/juniper/JuniperVendorConfigurationOLD.java
	deleted:    projects/batfish/src/batfish/representation/juniper/Martian.java
	new file:   projects/batfish/src/batfish/representation/juniper/MatchType.java
	modified:   projects/batfish/src/batfish/representation/juniper/OSPFNetwork.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatement.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementClause.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchAsPathAccessListLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchCommunityListLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchFamilyLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchInterfaceListLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchIpAccessListLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchIpPrefixListLine.java
	renamed:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_SetLine.java -> projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchNeighborLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchPrefixListFilterLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchPrefixListLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchProtocolLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchProtocolListLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchRibFromLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchRibToLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchRouteFilterLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementMatchSourceAddressFilterLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetAdditiveCommunityLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementSetAsPathPrepend.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementSetCommunityAddLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementSetCommunityDeleteLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetCommunityLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementSetCommunitySetLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetDeleteCommunityLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatementSetInstallNextHopLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetLocalPreferenceLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetMetricLine.java
	modified:   projects/batfish/src/batfish/representation/juniper/PolicyStatementSetNextHopLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_HopType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_LineAction.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_MatchLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_MatchType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_SetType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PolicyStatement_Term.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PrefixList.java
	deleted:    projects/batfish/src/batfish/representation/juniper/PrefixListLine.java
	deleted:    projects/batfish/src/batfish/representation/juniper/ProtocolOps.java
	deleted:    projects/batfish/src/batfish/representation/juniper/ProtocolType.java
	new file:   projects/batfish/src/batfish/representation/juniper/RouteFilter.java
	new file:   projects/batfish/src/batfish/representation/juniper/RouteFilterLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/RouteFilterLineType.java
	new file:   projects/batfish/src/batfish/representation/juniper/RouteFilterSubRangeLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/RouteFilterThroughLine.java
	new file:   projects/batfish/src/batfish/representation/juniper/SetType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptionsType.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Active.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_AsPath.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Communities.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Discard.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Install.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Metric.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_NextHop.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_NextTable.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Preference.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Readvertise.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Resolve.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Retain.java
	deleted:    projects/batfish/src/batfish/representation/juniper/StaticOptions_Tag.java
	modified:   projects/batfish/src/batfish/representation/juniper/StaticRoute.java
	deleted:    projects/batfish/src/batfish/representation/juniper/System.java
	modified:   projects/batfish/src/batfish/util/Util.java
	deleted:    projects/batfish/src/batfish/z3/RoleReachabilityQuerySynthesizer.java
	deleted:    projects/batfish/src/batfish/z3/RoleTransitQuerySynthesizer.java
	modified:   projects/batfish/src/batfish/z3/Synthesizer.java
	deleted:    projects/batfish/src/batfish/z3/node/ExternalDestinationIpExpr.java
	deleted:    projects/batfish/src/batfish/z3/node/ExternalSourceIpExpr.java
	deleted:    projects/batfish/src/batfish/z3/node/NodeTransitExpr.java
	deleted:    projects/batfish/src/batfish/z3/node/RoleAcceptExpr.java
	deleted:    projects/batfish/src/batfish/z3/node/RoleOriginateExpr.java
	deleted:    projects/batfish/src/log4j2.xml
	new file:   projects/complexity/lib/antlr/LICENSE
	new file:   projects/complexity/lib/antlr/LICENSE-ANTLRv4
	new file:   projects/complexity/lib/antlr/antlr-3.4-complete.jar
	new file:   projects/complexity/lib/antlr/antlr-4.4-complete.jar
	new file:   projects/complexity/lib/commons/LICENSE
	new file:   projects/complexity/lib/commons/commons-cli-1.2.jar
	new file:   projects/complexity/lib/commons/commons-codec-1.6.jar
	new file:   projects/complexity/lib/commons/commons-configuration-1.8.jar
	new file:   projects/complexity/lib/commons/commons-io-2.4.jar
	new file:   projects/complexity/lib/commons/commons-lang-2.6.jar
	new file:   projects/complexity/lib/commons/commons-logging-1.1.1.jar
	new file:   projects/complexity/lib/eclipse/APACHE-LICENSE
	new file:   projects/complexity/lib/eclipse/ECLIPSE-LICENSE.html
	new file:   projects/complexity/lib/eclipse/NOTICE
	new file:   projects/complexity/lib/eclipse/jetty-client-7.6.7.v20120910.jar
	new file:   projects/complexity/lib/eclipse/jetty-http-7.6.7.v20120910.jar
	new file:   projects/complexity/lib/eclipse/jetty-io-7.6.7.v20120910.jar
	new file:   projects/complexity/lib/eclipse/jetty-util-7.6.7.v20120910.jar
	new file:   projects/complexity/lib/guava/LICENSE
	new file:   projects/complexity/lib/guava/guava-15.0.jar
	new file:   projects/complexity/lib/httpcomponents/LICENSE.txt
	new file:   projects/complexity/lib/httpcomponents/fluent-hc-4.2.5.jar
	new file:   projects/complexity/lib/httpcomponents/httpclient-4.2.5.jar
	new file:   projects/complexity/lib/httpcomponents/httpclient-cache-4.2.5.jar
	new file:   projects/complexity/lib/httpcomponents/httpcore-4.2.4.jar
	new file:   projects/complexity/lib/httpcomponents/httpmime-4.2.5.jar
	new file:   projects/complexity/lib/logicblox/lb-common-protocol.jar
	new file:   projects/complexity/lib/logicblox/lb-common.jar
	new file:   projects/complexity/lib/logicblox/lb-connectblox.jar
	new file:   projects/complexity/lib/logicblox/lb-web-client.jar
	new file:   projects/complexity/lib/protobuf/LICENSE
	new file:   projects/complexity/lib/protobuf/protobuf-2.5.0.jar
	new file:   projects/complexity/lib/xstream/LICENSE
	new file:   projects/complexity/lib/xstream/xstream-1.4.7.jar
	deleted:    test_rigs/example/node_roles
	modified:   tools/batfish_functions.sh
	deleted:    tools/common.sh
	deleted:    tools/destination.sh
	deleted:    tools/multipath.sh
	deleted:    tools/role_reachability.sh
	deleted:    tools/role_transit.sh
	deleted:    tools/single_interface_failure.sh
	deleted:    tools/single_node_failure.sh
	modified:   projects/complexity/build.xml
	modified:   projects/complexity/complexity
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammar.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammarCommonLexer.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammarCommonParser.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammar_acl.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammar_bgp.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/CiscoGrammar_interface.g4
	modified:   projects/complexity/src/batfish/grammar/cisco/controlplane/CiscoControlPlaneComplexity.java