Policy monitoring should monitor for the current policy that is enforced for the device (device_policy table)
Merge remote-tracking branch 'origin/rc4' into rc4