using updated xpath with xi:include

modified all existing files using xi:include that require the hierarchy to be striped out. dave cramer is super awesome.

bug/1226775

Change-Id: Ic4618329e9a3b4de7cfdc91701678f34f7828a9a
Merge "using updated xpath with xi:include"