Fix bad merge caught by test in zpool state
Fix bad merge caught by test in zpool state

Also fix up some of the comment formatting

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt