Merge "Pin docker version for atomic at 1.8.2"