Fix EZP-21963: create separate "promise-based" build
fixes according to review