Fix base model can_contain local variable name conflict (OMS-507)
Fix a bug with can_contain re Symlinks + logging aid (OMS-507)