fix bug in TestGraph where a node was misspelled for Query7Graph
fix bug in importer that prevented person_likes_comment from being loaded
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'