Merge pull request #2304 from stewart-ibm/zz-defconfig-update

zz: Don't build OCC