Added new class for duplicate org repair

USERGRID-1351
Final pass of org merge

USERGRID-1351