Entity status + drafty

Same changes as https://www.drupal.org/node/2389185
Have done this and removed from the PR here.