make sure that layouts with no layout blocks are correctly updated and put in draft mode
Merge branch 'refs/heads/master' into 2.1