Continue working on Nginx packaging
Merge more changes from the Ubuntu Saucy package