Fixes for zendesk url
Merge branch '4.2-maint' into newdev
Merge branch '4.2-maint' into newdev
XMerge branch '4.2-maint' into newdev