Merge pull request #2402 from lorenzocaum/1.2.x

Added the country of Curaçao
#2389 Fixed category meta saving to properly create new entries and update existing entries
Adding collection.facet-label theme API tag.
Modified collection.facet-label to use collection.facet-filter-label instead. Moved function to follow more logical ordering. Removed php close tag at end of file.