Merge "Added uid and gid to docker testing"