Merge changes from topic "configuration_gender"

* changes:
  Fix test case fail
  Add a new field in Configuration and persist the field
  Add a system service for grammatical gender