adding commitConflictsWithParent functionality (see also https://github.com/sproutcore/sproutcore/pull/938)
adding more SC.Query API conformity