Changes applied for the RHOS certification

Change-Id: I25bf5db8e91d79688a490a484fb38b204ea6ff8c
Signed-off-by: Rossella Sblendido <rossella@midokura.com>