add BUILD_CLOUD to configure.ac
Revert libzlib merge conflict change
Merge branch 'feature/cloud' into build/guardian