Merge "RestResourceResolutionProcessor should always set Status" into frankfurt