Make upstream resource OS aware

Added OS awareness like the other resources. Slightly modified the concat ordering to just put upstream at the top of the conf

Without this change, trying to use an upstream on Ubuntu is simply broken.