Merge branch 'master' into FLUID-4907-test

Conflicts:
	src/webapp/components/uiOptions/js/FatPanelUIOptions.js
	src/webapp/components/uiOptions/js/UIOptions.js
	src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
FLUID-5099: adding a test case and a fix for change request source name collision.
Merge remote-tracking branch 'cli/FLUID-4907-merging' into FLUID-4907

Conflicts:
	src/webapp/components/uiOptions/js/FatPanelUIOptions.js
	src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
Merge branch 'FLUID-5099' into FLUID-4907
FLUID-4907: fixed aux builder tests.
Merge remote-tracking branch 'yura/FLUID-4907' into FLUID-4907