Merge "Revert "Remove the skip_unless_config and skip_if_config decorators""