Comment out test options that already exists on tempest's tree
Comment out test options that already exists on tempest's tree

Since we can't remove ironic's  tests and options from tempest's tree
until liberty-eol (to tests stable branches) we can't have such options
on our tree, except of course new options like deploywait_timeout.

Change-Id: If98cfea3e1235f6ffcdb1f47d6c64e65d094168f

NaohiroTamura/ironic,devananda/ironic,openstack/ironic,NaohiroTamura/ironic,dims/ironic,bacaldwell/ironic,dims/ironic,openstack/ironic,pshchelo/ironic,SauloAislan/ironic,pshchelo/ironic,SauloAislan/ironic,bacaldwell/ironic