Fixes bugs for integration with policy module

Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
6 files changed