Entity status + drafty

Same changes as https://www.drupal.org/node/2389185
I would definitely prefer this to not be in cps.module