DATAGRAPH-433: Begin fixing of how  uniquely indexed properties are handled