bf-opencl:code cleanup
bf-opencl:code cleanup
bf-opencl:code cleanup
Merge pull request #307 from Sayantan2048/bleeding-jumbo

bf-opencl code cleanups
Incremental: Correct progress for multiple nodes.
MPI: Tweaks for file locking problems during restore.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  MPI: Tweaks for file locking problems during restore.
  Incremental: Correct progress for multiple nodes.
  bf-opencl:code cleanup
  bf-opencl:code cleanup
  bf-opencl:code cleanup