rhbz953734 - refactor content state
Merge branch 'review-2-rhbz953734' of github.com:zanata/zanata-common into review-2-rhbz953734