Bug 5830: Mandatory leaf enforcement is not correct with presence container