Merge pull request #43 from Coenego/avocet-master-merge

Avocet master merge
(Issue 937) Use min and max height for logo
Follow up on institutional logo size limit
Don't link to users profile path in comments and header of email if the profile isn't public
(3akai-ux Issue 3778) Tweak logging to not give error when it should warn
Merge pull request #939 from bp323/issue-3778

Don't link to the user's profile if it's not public in emails
(BuildFailure) Fix outdated bundle data in oae-ui test
Merge pull request #941 from mrvisser/oae-ui-failure

(BuildFailure) Fix outdated bundle data in oae-ui test
(3akai-ux Issue 3778) Do not break from sending emails if one email failed to send to a user
Minor comment fix
Fixed updatedSecondUser variable name
Merge pull request #940 from mrvisser/3akai-ux-issue-3778

Tweak logging to not give error when it should warn
(IntermittentAutoclose) Just ensure the connection closes automatically, don't put strict time on it
(README) Update elasticsearch version to 1.1
(Issue 944) Do not show private display names or thumbnail images as links in emails
Merge pull request #944 from mrvisser/issue-944

Profile pic in email for private user is a link when it should just be an image
(Migration 7.0) Move migration directory to proper version
Merge pull request #946 from mrvisser/update-migration-7.0

(Migration 7.0) Move migration directory to proper version
Merge pull request #942 from mrvisser/intermittent-autoclose-failure

(IntermittentAutoclose) Just ensure the connection closes automatically, don't put strict time on it
Merge branch 'oaemaster' into avocet-master-merge