new bucket name in config.properties
Merge branch 'devel'
Fixed bug: need for getAllSubscriptions and getExternalSubscriptions
getLastUpdate in private api should not return data[ ]
Added elasticsearch unicast connection properties
corrected search_ports string
minor changes in config.properties
Merge branch 'srf-12' into new-datamodel
resolve merging conflitcs
Keep the public config.properties version for the VM configuration
Added GetAllSOsPrivate
Merge branch 'GetAllSOsPrivate'
Merge branch 'master' into security