Import nginx version 1.7.0
Import ohai version 1.1.10
Merge branch 'master' into develop