Merge "Revert "[CEC Configuration] Move master configuration from '/pro...""