Fix bug 1031563 - highlight error messages generated by formtastic
Fix assertion messages in functional api
Merge pull request #4195 from liggitt/bug_1031563_error_message_highlight

Merged by openshift-bot
Bug 1029679: handle connection refused error with clean error message
Merge pull request #4196 from pmorie/dev/fix-tests

Merged by openshift-bot
Merge pull request #4192 from bparees/haproxy-connect-fail

Merged by openshift-bot
Merge remote-tracking branch 'upstream/master'