Add support for --cap-add and --cap-drop

Linked to #6687 
Is this an artifact from a merge conflict?