Merge "Add HDMI-CEC version config to CEC master config"