[453331] Ensure valueName is protected against reserved names
Merge branch 'master' into ewillink/ocl25