Merge "[CEC Configuration] Move master configuration from '/product/etc' to '/etc'"