Event col fix

Few changes.

1. created a new local branch, cherry picked 022780a6
2. changed xml file to change the registry path where the version gets stored, I'd got the wrong location originally.
3. pushed to new branch

packages/win_event_col.xml

@@ -8,14 +8,21 @@
 	<variable name="VERSION"  value="1" />
 	<variable name="CONFIG"  value="server_config.xml" />
 
-	<check type='registry' condition='equals' path='%WPKG_REG%\event_collection\version' value="%version%" />
+	<check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\event_collector\version' value="%version%"/>
 
 	<install cmd='cmd /c wecutil cs "%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\windows_event_collector_service\%CONFIG%"' />
-	<install cmd='reg add %WPKG_REG%\event_collection /t reg_sz /v version /d %version% /f' />
+	<install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk\event_collector /t reg_sz /v version /d %version% /f'/>
 	<install cmd='cmd /c netsh http add urlacl url=http://+:5985/wsman/ sddl="D:(A;;GX;;;S-1-5-80-569256582-2953403351-2909559716-1301513147-412116970)(A;;GX;;;S-1-5-80-4059739203-877974739-1245631912-527174227-2996563517)"' />
 
+	<upgrade include='remove' />
+	<upgrade include='install' />
+
 	<remove cmd='cmd /c wecutil ds "maths.cam.ac.uk domain collection"' />
-	<remove cmd='reg delete %WPKG_REG%\event_collection /f' />
+	<remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk\event_collector /f'>
+		<condition>
+			<check type='registry' condition='exists' path='HKLM\software\ucam_wpkg.cam.ac.uk\event_collector' />
+		</condition>
+	</remove>
 	<remove cmd='cmd /c netsh http delete urlacl url=http://+:5985/wsman/' />
 
 </package>
@@ -28,4 +35,3 @@ netsh http show urlacl
 netsh http delete urlacl url=http://+:5985/wsman/
 netsh http add urlacl url=http://+:5985/wsman/ sddl="D:(A;;GX;;;S-1-5-80-569256582-2953403351-2909559716-1301513147-412116970)(A;;GX;;;S-1-5-80-4059739203-877974739-1245631912-527174227-2996563517)"
 			-->
-