Merge changes Ie8759ae5,I5bb23420,I5b2b0f3f

* changes:
  Add more Cequint provider and signature check.
  Use correct field type for annotation definition.
  Search now supports alternative sort and display orders for contact names.