Merge "Re-enable trigger for reclass-system tests"