adding unit test to registry resources and fixing some issues in the cpi - AIRAVATA-1006
committing more changes with orchestrator-registry integration - AIRAVATA-1028
fixing merge