Reorder and tweak aggregationInfo XPath one more time
Merge branch 'onlineresource_xpath_fix' into onlineresource_xpath_fix_test