Fix skipping tests for hdp, cdh, and vanilla 2 plugins

Change-Id: I0b45c9cc435d022efdeae5a247fa51ffd0e7cc91
Merge "Fix skipping tests for hdp, cdh, and vanilla 2 plugins"