fixed dockerdev setup with cidfiles dir
Merge branch 'staging' into gh-965