fixes for catalog:
only show annotated items by default in catalog, annotate a few more items better, and provide a new endopint for forwarding icons if they are internal
brooklyn.properties: configure file locations, and support local

- adds BrooklynProperties.Factory.Builder, where can set paths
  for various properties files (rather than all hard-coded)
- brooklyn script (i.e. Main class) accepts --localBrooklynProperties
  to specify a file that appends to and overrides values in global
  brooklyn.properties
- BrooklynNode takes "global" and "local" property files contents
Adds JcloudsLocationConfig.TAGS

- sets jclouds TemplateOptions.tags(...)
EntityDynamicType.buildConfigKeys: avoid fail if field inaccessible

- if a field is inaccessible, warn and continue rather than throwing
  exception (previous no config keys are reported)
- can happen if an entity declares private ConfigKey
adds/uses `ResourceUtils.mergeFilePaths(String…)`
Merge pull request #850 from aledsage/feature/BrooklynNode-setBrooklynPropertiesPath

brooklyn.properties: configure file locations, and support local
tidy following code review
Merge pull request #852 from ahgittin/fix/catalog-and-icons

fixes for catalog:
Updated the maven poms to include Hazelcast
Added HazelcastDatagrid and added the StorageFactory
EntityId has serialVersionUid
Made EntitySpec and LocationSpec serializable since they need to go over the line.
Processed review comments
The BrooklynStorage implementation is now configurable through a Brooklyn property
Resolved merge conflict