Fixed several issues with device reconciliation.
Fixed several issues with device reconciliation.

DBCG/Dataphor,DBCG/Dataphor,n8allan/Dataphor,n8allan/Dataphor,n8allan/Dataphor,DBCG/Dataphor,n8allan/Dataphor,DBCG/Dataphor,n8allan/Dataphor,DBCG/Dataphor,n8allan/Dataphor,DBCG/Dataphor