FLUID-5099: adding a test case and a fix for change request source name ...

...collision.