CB-6874 Consolidate <Content> tag additions into 1 ItemGroup

Windows Phone 8 and Windows8
https://issues.apache.org/jira/browse/CB-6874