Adding system type tracking to managed systems

As discussed in 589739