[NOJIRA] Add resource aggregation.  Fix resource paths so they are not aggregated.