DROOLS-198 Separate Rete and Phreak
-Going through classes removing isUnlinkEnabled, and refactoring the related code into phreak/rete separations
-fixed bad git conflict handling