Adding support to ignore glass_locks for UM2 and UMO+