Replacing MutexLock by std::lock_guard.
Cleanup of util and main heards, especially C++11 changes.