# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Goodness-of-fit was removed from the return values, as only Rwp is exposed
for the entire refinement when using more than one phase. System test
reference files needed to be updated accordingly

The PhaseFile property was changed to a MultipleFileProperty to allow
several phase files to be used in the same refinement. Each separate file
is now read and added accordingly to the gpx object during refinement

rhel7 is using numpy 1.7 and ubuntu14.04 is using numpy 1.8

Refs #21358

Refs #21358