Clean up for 'USE_CACHE' options
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master