Merge pull request #1426 from wp-cli/1426-two-plugins-one-dir

Passing wp plugin activate a full plugin path
Conflicts:
	features/plugin.feature