Remove corresponding gwc files for xbt_nrt and xbt_dm
Merge branch 'master' into production