[mongodb/f16] (6 commits) ...fix bad merge

[Nathaniel McCallum]

Summary of changes:

  5cfdfb9... Build with js 1.8.5 (*)
  117d484... Fix the js 1.8.5 patch to work properly (*)
  ad4d773... Fix mongodb startup with systemd (*)
  f620d41... Add a mongodb.conf file to /usr/lib/tmpfiles.d (*)
  5b7e706... merge master into f15 (*)
  9d6c69b... fix bad merge (*)

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