Merge branch 'richardmaw/builddir-sockets' into 'master'

Fix: While caching build artifact: "Cannot extract [path to socket file] into staging-area. Unsupported type."

See merge request !783