[Fix 934495] Move the messages block in the base template into
content_wrapper block for better placement of the messages.