CMS-1478 JBoss bug with OSGi framwork location.
CMS-1374 Cluster / Elasticsearch option cleanup

Added new options and translations for cluster
Merge pull request #31 from enonic/CMS-1478

CMS-1478 JBoss bug with OSGi framwork location.
CMS-1478 JBoss bug with OSGi framework location.
Merge branch 'master' into CMS-1478