Merge "Add image client build timeout config option"