PE: Allow resource colocation based on node attributes other than #id
This allows one to put resources on the same group of nodes.

Includes fixes for some colocation bugs that were exposed during implementation

Mercurial revision: bbd72137ca68ade7eff915b06ed8560d90bfccf1