[18.09 backport] builder: treat unset keep-storage as 0 Upstream-commit: 7c63f178e7f2405337893c14b3c8c748b5cc1897 Component: engine