clean up properties files, add ElasticSearch, S3Current and DynamoDBElec...

...tor options