Fixed the solution file for kudu test swarm builds.
Merge branch 'release' into dev