Fixed usage of getNumberOfCollectionElements: now for maps
Merge branch 'fix-usage-number-collection-elements' into kirikaza

* fix-usage-number-collection-elements:
  Fixed usage of getNumberOfCollectionElements: now for maps