Partial fix for bug 936 (MON Part)

Change-Id: Ia574c865aa4d68d1e5bf4778762d96590e9bc907
Signed-off-by: lavado <glavado@whitestack.com>
3 files changed