Merge changes I7790dde8,I065907a5,Id2e82024 into main

* changes:
  Add missing <assert.h> include
  Add missing <functional> and <vector> includes
  snapuserd_test: don't discard result of std::async