Move to long term CLSCOM workaround

Change-Id: I33ff7d349b63c54794bf6acf806c89d22e5d9ac0
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81474
Reviewed-by: Adam S Hale <adam.samuel.hale@ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: Adam S Hale <adam.samuel.hale@ibm.com>
Reviewed-by: Devon A Baughen <devon.baughen1@ibm.com>
Reviewed-by: SHELTON LEUNG <sleung@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81487
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>