Issue-538: Includes fixes in compliance module
Issue-538: Includes fixes in compliance module

Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server