Fix #9520 State  can't handle multiple swap partitions
Merge pull request #9666 from dmyerscough/develop

Fix #9520 State  can't handle multiple swap partitions