silence gcc error, "should return a value [-Wreturn-type]"
Tweaked the last change a bit to follow coding guidelines.
Ticket [f58015fbd0]: ftp - DisplayMsg - Removed bogus use of ::errorInfo. Simplified the code a bit.
Merge RC with latest fixes