Issue #2365705 by mcdruid: Add end addtogroup hooks to entity.api.php
Issue #1953770 by amateescu: Move the field-specific settings form elements at the top of the form.