Merge in changes and keep versioning of nginx package.