Merge 'develop' into 'amd-staging'

Change-Id: Ia4e86a95f7437edb507e0a9c7dbd7b983578c175

catch/hipTestMain/config/config_amd_linux_common.json

@@ -50,6 +50,7 @@
 	   "Note: Test disabled due to defect - EXSWHTEC-207",
 	   "Unit_hipGraphExecMemsetNodeSetParams_Negative_Updating_Non1D_Node",
 	   "Unit_hipIpcGetMemHandle_Positive_Unique_Handles_Separate_Allocations",
+	   "Unit_hipStreamCreateWithFlags_DefaultStreamInteraction",
 	   "Unit_hipStreamWaitEvent_UninitializedStream_Negative",
 	   "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters"
 	]

catch/hipTestMain/config/config_amd_windows_common.json

@@ -146,6 +146,7 @@
 	   "Unit_hipGraphExecMemsetNodeSetParams_Positive_Basic - uint32_t",
 	   "Unit_hipGraphMemsetNodeSetParams_Positive_Basic - uint8_t",
 	   "Unit_hipStreamWaitEvent_UninitializedStream_Negative",
-	   "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters"
+	   "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters",
+	   "Unit_hipDeviceGetUuid_Positive"
 	]
 }