Fix for reconciliation by id (Advanced Mode) -reintegrated from branch 2.0
Fix for reconciliation by id (Advanced Mode) -reintegrated from branch 2.0

ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop