Only add LDFLAGS/CFLAGS for libcurl if it's not in /usr
Merge branch 'master' into always-on-json