Issue #1229014 by bfroehle, jackbravo: Content-Disposition header makes private files show open/save prompts, but public files show inline.

Issue #1852966 by yched, Stalski, zuuperman, swentel: Rework entity display settings around EntityDisplay config entity.

Revert "Issue #1852966 by yched, swentel: Rework entity display settings around EntityDisplay config entity."

This reverts commit 8ad67af2.

Issue #1852966 by yched, swentel: Rework entity display settings around EntityDisplay config entity.

Issue #552604 by sun, lambic, swentel, yched, Lukas von Blarer: Adding new fields leads to a confusing 'Field settings' form.

Issue #1308564 by amontero, madmatter23, kbasarab, guile2912, Deciphered: Added Basic token support in fields' help texts.

Issue #1175764 by tim.plunkett, Rob Loach, eojthebrave: Added Have theme('image_style()') inject the style name as a class.

Issue #1773032 by Jorrit, quicksketch: Fixed Non-standard and pointless name attribute added to Content-Type header.

Revert "Issue #1586356 by dww, amateescu: Fixed Missing 'weight' support from hook_field_widget_info() makes it impossible to sanely order widgets."

This reverts commit 2ffe4abd. Totally, totally wrong commit message.

Issue #1586356 by dww, amateescu: Fixed Missing 'weight' support from hook_field_widget_info() makes it impossible to sanely order widgets.

Issue #1184272 by Berdir, corvus_ch, sun: Remove deprecated $conditions support from entity controller.

Issue #1711070 by kid_icarus, tim.plunkett, xjm, droplet, zendoodles and cam8001: Convert tests to use ::$modules property instead of parent::setUp($modules).

Issue #1446464 by cfennell, Berdir, aaron, tim.plunkett: Get rid of file_field_load() - shouldn't load all file object data with field load - only file ID.