[#1864] Resource plugin makefiles are no longer platform dependent.
[#1864] Network plugin makefiles are no longer platform dependent.
Merge with master
Merge with master