CLOUD-9 fixing the broken build