HIVE-4373 - fix common/build