Merge commit of Securitmgr 0.5

Change-Id: I4c796bce84fb431a9e83dd0aa05e0b3466547ce8
Signed-off-by: Meggan Ehret <meggan@qeo.org>