diff -uNr a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
--- a/fence/agents/lib/fencing.py.py	2017-07-25 13:09:37.611338735 +0200
+++ b/fence/agents/lib/fencing.py.py	2017-07-25 14:45:55.177947410 +0200
@@ -615,8 +615,10 @@
 
 	if avail_opt.count("no_status") == 0:
 		print "\t<action name=\"status\" />"
-	print "\t<action name=\"list\" />"
-	print "\t<action name=\"list-status\" />"
+	
+	if avail_opt.count("separator"):
+		print "\t<action name=\"list\" />"
+		print "\t<action name=\"list-status\" />"
 	print "\t<action name=\"monitor\" />"
 	print "\t<action name=\"metadata\" />"
 	print "\t<action name=\"validate-all\" />"
@@ -820,6 +822,10 @@
 	if 1 == device_opt.count("no_status"):
 		acceptable_actions.remove("status")
 
+	if not device_opt.count("separator"):
+		acceptable_actions.remove("list")
+		acceptable_actions.remove("list-status")
+
 	if 1 == device_opt.count("diag"):
 		acceptable_actions.extend(["diag"])
 
diff -uNr a/tests/data/metadata/fence_alom.xml b/tests/data/metadata/fence_alom.xml
--- a/tests/data/metadata/fence_alom.xml	2017-07-25 13:09:37.611338735 +0200
+++ b/tests/data/metadata/fence_alom.xml	2017-07-25 14:49:00.542377375 +0200
@@ -169,8 +169,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml
--- a/tests/data/metadata/fence_amt.xml	2017-07-25 13:09:37.611338735 +0200
+++ b/tests/data/metadata/fence_amt.xml	2017-07-25 14:49:01.818359686 +0200
@@ -162,8 +162,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
--- a/tests/data/metadata/fence_compute.xml	2017-07-25 13:09:37.620338610 +0200
+++ b/tests/data/metadata/fence_compute.xml	2017-07-25 14:49:02.821345781 +0200
@@ -3,10 +3,15 @@
 <longdesc>Used to tell Nova that compute nodes are down and to reschedule flagged instances</longdesc>
 <vendor-url></vendor-url>
 <parameters>
-	<parameter name="region-name" unique="0" required="0" deprecated="1">
-		<getopt mixed="--region-name=[region]" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Region Name</shortdesc>
+	<parameter name="tenant_name" unique="0" required="0">
+		<getopt mixed="-t, --tenant-name=[tenant]" />
+		<content type="string"  />
+		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
+	</parameter>
+	<parameter name="auth_url" unique="0" required="0">
+		<getopt mixed="-k, --auth-url=[url]" />
+		<content type="string"  />
+		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
 	</parameter>
 	<parameter name="port" unique="0" required="1" deprecated="1">
 		<getopt mixed="-n, --plug=[id]" />
@@ -18,26 +23,21 @@
 		<content type="string"  />
 		<shortdesc lang="en">Script to retrieve password</shortdesc>
 	</parameter>
-	<parameter name="auth-url" unique="0" required="0" deprecated="1">
-		<getopt mixed="-k, --auth-url=[url]" />
-		<content type="string"  />
-		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
+	<parameter name="region_name" unique="0" required="0">
+		<getopt mixed="--region-name=[region]" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Region Name</shortdesc>
 	</parameter>
 	<parameter name="passwd" unique="0" required="0" deprecated="1">
 		<getopt mixed="-p, --password=[password]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login password or passphrase</shortdesc>
 	</parameter>
-	<parameter name="endpoint-type" unique="0" required="0" deprecated="1">
+	<parameter name="endpoint_type" unique="0" required="0">
 		<getopt mixed="-e, --endpoint-type=[endpoint]" />
 		<content type="string" default="internalURL"  />
 		<shortdesc lang="en">Nova Endpoint type</shortdesc>
 	</parameter>
-	<parameter name="tenant-name" unique="0" required="0" deprecated="1">
-		<getopt mixed="-t, --tenant-name=[tenant]" />
-		<content type="string"  />
-		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
-	</parameter>
 	<parameter name="action" unique="0" required="1">
 		<getopt mixed="-o, --action=[action]" />
 		<content type="string" default="off"  />
@@ -53,31 +53,11 @@
 		<content type="string"  />
 		<shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
 	</parameter>
-	<parameter name="region_name" unique="0" required="0" obsoletes="region-name">
-		<getopt mixed="--region-name=[region]" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Region Name</shortdesc>
-	</parameter>
-	<parameter name="tenant_name" unique="0" required="0" obsoletes="tenant-name">
-		<getopt mixed="-t, --tenant-name=[tenant]" />
-		<content type="string"  />
-		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
-	</parameter>
 	<parameter name="username" unique="0" required="0" obsoletes="login">
 		<getopt mixed="-l, --username=[name]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login Name</shortdesc>
 	</parameter>
-	<parameter name="endpoint_type" unique="0" required="0" obsoletes="endpoint-type">
-		<getopt mixed="-e, --endpoint-type=[endpoint]" />
-		<content type="string" default="internalURL"  />
-		<shortdesc lang="en">Nova Endpoint type</shortdesc>
-	</parameter>
-	<parameter name="auth_url" unique="0" required="0" obsoletes="auth-url">
-		<getopt mixed="-k, --auth-url=[url]" />
-		<content type="string"  />
-		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
-	</parameter>
 	<parameter name="password" unique="0" required="0" obsoletes="passwd">
 		<getopt mixed="-p, --password=[password]" />
 		<content type="string"  />
@@ -98,36 +78,21 @@
 		<content type="string"  />
 		<shortdesc lang="en">DNS domain in which hosts live</shortdesc>
 	</parameter>
-	<parameter name="instance-filtering" unique="0" required="0" deprecated="1">
+	<parameter name="instance_filtering" unique="0" required="0">
 		<getopt mixed="--instance-filtering" />
 		<content type="boolean" default="True"  />
 		<shortdesc lang="en">Allow instances to be evacuated</shortdesc>
 	</parameter>
-	<parameter name="no-shared-storage" unique="0" required="0" deprecated="1">
+	<parameter name="no_shared_storage" unique="0" required="0">
 		<getopt mixed="--no-shared-storage" />
 		<content type="boolean" default="False"  />
 		<shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc>
 	</parameter>
-	<parameter name="record-only" unique="0" required="0" deprecated="1">
-		<getopt mixed="--record-only" />
-		<content type="string" default="False"  />
-		<shortdesc lang="en">Only record the target as needing evacuation</shortdesc>
-	</parameter>
-	<parameter name="instance_filtering" unique="0" required="0" obsoletes="instance-filtering">
-		<getopt mixed="--instance-filtering" />
-		<content type="boolean" default="True"  />
-		<shortdesc lang="en">Allow instances to be evacuated</shortdesc>
-	</parameter>
-	<parameter name="record_only" unique="0" required="0" obsoletes="record-only">
+	<parameter name="record_only" unique="0" required="0">
 		<getopt mixed="--record-only" />
 		<content type="string" default="False"  />
 		<shortdesc lang="en">Only record the target as needing evacuation</shortdesc>
 	</parameter>
-	<parameter name="no_shared_storage" unique="0" required="0" obsoletes="no-shared-storage">
-		<getopt mixed="--no-shared-storage" />
-		<content type="boolean" default="False"  />
-		<shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc>
-	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
 		<content type="boolean"  />
@@ -168,16 +133,16 @@
 		<content type="second" 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="20"  />
-		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
-	</parameter>
 	<parameter name="delay" unique="0" required="0">
 		<getopt mixed="--delay=[seconds]" />
 		<content type="second" default="0"  />
 		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
 	</parameter>
+	<parameter name="power_timeout" unique="0" required="0">
+		<getopt mixed="--power-timeout=[seconds]" />
+		<content type="second" default="20"  />
+		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
+	</parameter>
 	<parameter name="shell_timeout" unique="0" required="0">
 		<getopt mixed="--shell-timeout=[seconds]" />
 		<content type="second" default="180"  />
diff -uNr a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml
--- a/tests/data/metadata/fence_drac.xml	2017-07-25 13:09:37.612338721 +0200
+++ b/tests/data/metadata/fence_drac.xml	2017-07-25 14:49:01.670361738 +0200
@@ -149,8 +149,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml
--- a/tests/data/metadata/fence_dummy.xml	2017-07-25 13:09:37.612338721 +0200
+++ b/tests/data/metadata/fence_dummy.xml	2017-07-25 14:49:00.886372607 +0200
@@ -84,8 +84,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
--- a/tests/data/metadata/fence_idrac.xml	2017-07-25 13:09:37.613338707 +0200
+++ b/tests/data/metadata/fence_idrac.xml	2017-07-25 14:49:01.364365980 +0200
@@ -204,8 +204,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml
--- a/tests/data/metadata/fence_ilo2.xml	2017-07-25 13:09:37.613338707 +0200
+++ b/tests/data/metadata/fence_ilo2.xml	2017-07-25 14:49:01.520363817 +0200
@@ -175,8 +175,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml
--- a/tests/data/metadata/fence_ilo3_ssh.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_ilo3_ssh.xml	2017-07-25 14:49:00.997371068 +0200
@@ -179,8 +179,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
--- a/tests/data/metadata/fence_ilo3.xml	2017-07-25 13:09:37.613338707 +0200
+++ b/tests/data/metadata/fence_ilo3.xml	2017-07-25 14:49:01.260367421 +0200
@@ -204,8 +204,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml
--- a/tests/data/metadata/fence_ilo4_ssh.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_ilo4_ssh.xml	2017-07-25 14:49:01.028370638 +0200
@@ -179,8 +179,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
--- a/tests/data/metadata/fence_ilo4.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_ilo4.xml	2017-07-25 14:49:01.295366936 +0200
@@ -204,8 +204,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml
--- a/tests/data/metadata/fence_ilo_mp.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_ilo_mp.xml	2017-07-25 14:49:02.048356497 +0200
@@ -169,8 +169,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo_ssh.xml b/tests/data/metadata/fence_ilo_ssh.xml
--- a/tests/data/metadata/fence_ilo_ssh.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_ilo_ssh.xml	2017-07-25 14:49:00.964371525 +0200
@@ -179,8 +179,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml
--- a/tests/data/metadata/fence_ilo.xml	2017-07-25 13:09:37.613338707 +0200
+++ b/tests/data/metadata/fence_ilo.xml	2017-07-25 14:49:01.482364344 +0200
@@ -175,8 +175,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
--- a/tests/data/metadata/fence_imm.xml	2017-07-25 13:09:37.614338694 +0200
+++ b/tests/data/metadata/fence_imm.xml	2017-07-25 14:49:01.329366465 +0200
@@ -204,8 +204,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
--- a/tests/data/metadata/fence_ipmilan.xml	2017-07-25 13:09:37.615338680 +0200
+++ b/tests/data/metadata/fence_ipmilan.xml	2017-07-25 14:49:01.226367893 +0200
@@ -204,8 +204,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml
--- a/tests/data/metadata/fence_mpath.xml	2017-07-25 13:09:37.615338680 +0200
+++ b/tests/data/metadata/fence_mpath.xml	2017-07-25 14:49:02.420351340 +0200
@@ -97,8 +97,6 @@
 	<action name="on" on_target="1" automatic="1"/>
 	<action name="off" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml
--- a/tests/data/metadata/fence_rsa.xml	2017-07-25 13:09:37.615338680 +0200
+++ b/tests/data/metadata/fence_rsa.xml	2017-07-25 14:49:02.121355485 +0200
@@ -169,8 +169,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_rsb.xml b/tests/data/metadata/fence_rsb.xml
--- a/tests/data/metadata/fence_rsb.xml	2017-07-25 13:09:37.615338680 +0200
+++ b/tests/data/metadata/fence_rsb.xml	2017-07-25 14:49:02.494350314 +0200
@@ -169,8 +169,6 @@
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
diff -uNr a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
--- a/tests/data/metadata/fence_scsi.xml	2017-07-25 13:09:37.616338666 +0200
+++ b/tests/data/metadata/fence_scsi.xml	2017-07-25 14:49:01.104369584 +0200
@@ -4,11 +4,6 @@
 The fence_scsi agent works by having each node in the cluster register a unique key with the SCSI device(s). Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_scsi agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc>
 <vendor-url></vendor-url>
 <parameters>
-	<parameter name="aptpl" unique="0" required="0">
-		<getopt mixed="-a, --aptpl" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Use the APTPL flag for registrations. This option is only used for the 'on' action.</shortdesc>
-	</parameter>
 	<parameter name="nodename" unique="0" required="0">
 		<getopt mixed="-n, --nodename=[nodename]" />
 		<content type="string"  />
@@ -24,6 +19,11 @@
 		<content type="string"  />
 		<shortdesc lang="en">Key to use for the current operation. This key should be unique to a node. For the "on" action, the key specifies the key use to register the local node. For the "off" action, this key specifies the key to be removed from the device(s).</shortdesc>
 	</parameter>
+	<parameter name="aptpl" unique="0" required="0">
+		<getopt mixed="-a, --aptpl" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Use the APTPL flag for registrations. This option is only used for the 'on' action.</shortdesc>
+	</parameter>
 	<parameter name="devices" unique="0" required="0">
 		<getopt mixed="-d, --devices=[devices]" />
 		<content type="string"  />
@@ -96,11 +96,7 @@
 		<getopt mixed="--sg_turs-path=[path]" />
 		<shortdesc lang="en">Path to sg_turs binary</shortdesc>
 	</parameter>
-	<parameter name="corosync-cmap_path" unique="0" required="0" deprecated="1">
-		<getopt mixed="--corosync-cmap-path=[path]" />
-		<shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc>
-	</parameter>
-	<parameter name="corosync_cmap_path" unique="0" required="0" obsoletes="corosync-cmap_path">
+	<parameter name="corosync_cmap_path" unique="0" required="0">
 		<getopt mixed="--corosync-cmap-path=[path]" />
 		<shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc>
 	</parameter>
@@ -114,8 +110,6 @@
 	<action name="on" on_target="1" automatic="1"/>
 	<action name="off" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />