(bug 43629) inlcude all content namespaces, not just NS_MAIN

Change-Id: Ia1998a12f182805955aaab143fa6072b91cb6fd6
Merge "(bug 43629) inlcude all content namespaces, not just NS_MAIN"