Revert "Service OS flavour for mocking/unittests"

Reverts quattor/CAF#44