Remove more conflicts, and remove a requires for something that's not be...

...en built yet

Sighed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>