Changes to compile on fleet master branch. [Ready]

Make our fleet-client compatible with fleet 0.7