Merge "Revert the changes for Docker non root user"