Merge changes from topic "zram_loop"

* changes:
  Set the I/O scheduler of loop devices to 'none'
  Rename two local variables