Merge: The configuration control file for in OCERA tree build updated.