add support for capAdd

@cjellick This is the same PR from a different branch @ibuildthecloud 
I don't have a good answer for that.  Let me think about it.  But test_docker is just reserved for tests that actually interact with docker.