Prep for v7

Create separate plgin collections for v6 and c7 filtered by version support, merge the two build scripts into one, made it much more efficient (the old one did some things many times)