Index: fence-agents-4.0.22+git.1455008135.15c5e92/tests/data/metadata/fence_gce.xml
===================================================================
--- fence-agents-4.0.22+git.1455008135.15c5e92.orig/tests/data/metadata/fence_gce.xml
+++ fence-agents-4.0.22+git.1455008135.15c5e92/tests/data/metadata/fence_gce.xml
@@ -18,12 +18,7 @@ For instructions see: https://cloud.goog
 		</content>
 		<shortdesc lang="en">Method to fence</shortdesc>
 	</parameter>
-	<parameter name="plug" unique="0" required="1" obsoletes="port">
-		<getopt mixed="-n, --plug=[id]" />
-		<content type="string"  />
-		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
-	</parameter>
-	<parameter name="port" unique="0" required="1" deprecated="1">
+	<parameter name="port" unique="0" required="1">
 		<getopt mixed="-n, --plug=[id]" />
 		<content type="string"  />
 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
@@ -38,32 +33,17 @@ For instructions see: https://cloud.goog
 		<content type="string"  />
 		<shortdesc lang="en">Project ID.</shortdesc>
 	</parameter>
-	<parameter name="stackdriver-logging" unique="0" required="0" deprecated="1">
-		<getopt mixed="--stackdriver-logging" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Stackdriver-logging support.</shortdesc>
-	</parameter>
-	<parameter name="stackdriver_logging" unique="0" required="0" obsoletes="stackdriver-logging">
+	<parameter name="stackdriver-logging" unique="0" required="0">
 		<getopt mixed="--stackdriver-logging" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Stackdriver-logging support.</shortdesc>
 	</parameter>
-	<parameter name="quiet" unique="0" required="0">
-		<getopt mixed="-q, --quiet" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
-	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Verbose mode</shortdesc>
 	</parameter>
-	<parameter name="debug" unique="0" required="0" deprecated="1">
-		<getopt mixed="-D, --debug-file=[debugfile]" />
-		<content type="string"  />
-		<shortdesc lang="en">Write debug information to given file</shortdesc>
-	</parameter>
-	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+	<parameter name="debug" unique="0" required="0">
 		<getopt mixed="-D, --debug-file=[debugfile]" />
 		<content type="string"  />
 		<shortdesc lang="en">Write debug information to given file</shortdesc>
@@ -85,32 +65,32 @@ For instructions see: https://cloud.goog
 	</parameter>
 	<parameter name="delay" unique="0" required="0">
 		<getopt mixed="--delay=[seconds]" />
-		<content type="second" default="0"  />
+		<content type="string" default="0"  />
 		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
 	</parameter>
 	<parameter name="login_timeout" unique="0" required="0">
 		<getopt mixed="--login-timeout=[seconds]" />
-		<content type="second" default="5"  />
+		<content type="string" default="5"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
 	</parameter>
 	<parameter name="power_timeout" unique="0" required="0">
 		<getopt mixed="--power-timeout=[seconds]" />
-		<content type="second" default="60"  />
+		<content type="string" default="60"  />
 		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="power_wait" unique="0" required="0">
 		<getopt mixed="--power-wait=[seconds]" />
-		<content type="second" default="0"  />
+		<content type="string" default="0"  />
 		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="shell_timeout" unique="0" required="0">
 		<getopt mixed="--shell-timeout=[seconds]" />
-		<content type="second" default="3"  />
+		<content type="string" default="3"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
 	</parameter>
 	<parameter name="retry_on" unique="0" required="0">
 		<getopt mixed="--retry-on=[attempts]" />
-		<content type="integer" default="1"  />
+		<content type="string" default="1"  />
 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
 	</parameter>
 </parameters>
