Fix #9520 State  can't handle multiple swap partitions

This fixes the #9520 issue and works with #7079. We should only check the device name since it is unique within the /etc/fstab file.