Simpler plan repairing: now only fixes the first inconsistency
Merge branch 'Release/MileStone2/debug' of https://github.com/srnjcbsn/Beduin into Release/MileStone2/debug