Code review changes
Merge branch '18171' into development

Conflicts:
	Dev/Dev2.Activities.Designers/Designers2/Core/Help/HelpTextResources.Designer.cs
	Dev/Dev2.Activities.Designers/Designers2/Core/Help/HelpTextResources.resx
Revert "Merge branch '18171' into development"

This reverts commit b48662cf1a4123ce262a3cd8e9ff347ea0aba3d3, reversing
changes made to 84e09bc57c860d6d0ad4286e8fa38e17f5494b94.