fixed merge conflict artifacts
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
check_parameters.py: fixed description of oracle_tablespaces