[nginx/f17] (4 commits) ...Merge branch 'master' into f17

[Jamie Nguyen]

Summary of changes:

  a6548af... Fix pid path in nginx.conf (*)
  8e04e8e... Revert "Fix pid path in nginx.conf" (*)
  ee9a369... Fix pid path in nginx.conf (*)
  a7ecbde... Merge branch 'master' into f17

(*) This commit already existed in another branch; no separate mail sent