fix test 2 (site member can skip pinserver) #1028
change order of site member & pinserver checks #1527

first try to serve private file to site members, then fallback to
pinserver if that fails.