CA-137848: Store the subsystem IDs and names the right way round

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1805 from johnelse/ca-137848

CA-137848: Store the subsystem IDs and names the right way round