(QENG-1450) when docker options are already set they should...

... not be overridden

- as reported in https://github.com/puppetlabs/beaker/pull/509
- repackaged PR to meet contributor guidelines
Merge pull request #520 from anodelman/docker

(QENG-1450) when docker options are already set they should...