Merge "Clean up of Pair classes - drools-pdp"