Merge pull request #4833 from crosbymichael/pluginflag

Add opts flag for fine grained control over drivers