Merge "Remove deprecated options to enable/disable plugin tests"