Fixed: merging rules with different parent.
Authored by: instructor_ 2015-10-01
Parent: [r4124]
Child: [r4126]