Merge changes I1df46687,I3689abe4

* changes:
  Test for /proc/loadavg.
  Tests for /proc/{filesystems, swaps}