correct docblock
don't use magic finder methods
fix layout of remove template
convert object to array before merging use `array_merge()`
compensate for gettext positional replacement not working (refs #1350)
correct return values on Area arrays to be flat arrays
fix `getOwnerByArea()` method to return string
update config core.xml to enable storage class