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

Signed-off-by: John Else <john.else@citrix.com>
Merge remote-tracking branch 'creedence/master'

Merging CA-137848 fix from creedence