Merge "REST: Properly handle HEAD requests"