83ff7b0 Bring in backward compatible changes for modularity

Authored and Committed by mvadkert 6 years ago
    Bring in backward compatible changes for modularity
    
    Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>