Merge branch 'remapper-do-not-remap-constant-dynamic-and-handle-correctly' into 'master'

Remapper do not remap constant dynamic and handle correctly

Closes #317852

See merge request !203
1 job for master in 1 minute and 53 seconds (queued for 7 minutes and 8 seconds)
Status Job ID Name Coverage
  Test
failed #6250
build

00:01:53

 
Name Stage Failure
failed
build Test
* Get more help at https://help.gradle.org

Deprecated Gradle features were used in this build, making it incompatible with Gradle 5.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/4.9/userguide/command_line_interface.html#sec:command_line_warnings

BUILD FAILED in 1m 41s
54 actionable tasks: 54 executed
ERROR: Job failed: exit code 1