Merge proposals dependent on lp://staging/~fboucault/persistent-cache-cpp/crossbuild_fixes

lp://staging/~fboucault/persistent-cache-cpp/crossbuild_fixes has no merge proposals.