Remove the capability handling that we do ourselves
Use the new --cap-drop flag instead
Merge branch 'docker_12'