Entity status + drafty

Same changes as https://www.drupal.org/node/2389185
This could go into entity_status though still yes.