add includeInAll and allow merge nullValue for BooleanFieldMapper