CLOUDIFY-2655 separated elasticsearch from logstash in bootstrap_lxc script, upgraded elasticsearch to version 1.0.1
CLOUDIFY-2655 flake8 fixes
CLOUDIFY-2655 removed --web and --port parameters from logstash startup command in bootstrap
CLOUDIFY-2655 fixed logstash config: fixed elasticsearch integration config, changed logstash tcp port
CLOUDIFY-2655 fixed logstash config
Merge branch 'develop' into feature/CLOUDIFY-2655-Upgrade-Elasticsearch-Version
CLOUDIFY-2655 Fixed sanity: now supports new neutron region on openstack; fixed state==started assertion; fixed blueprint comparison assertion
CFY-297 commented out for supporting old hp region
CFY-297 commented out for supporting old hp region
Merge pull request #185 from CloudifySource/feature/CLOUDIFY-2655-Upgrade-Elasticsearch-Version

CLOUDIFY-2655 separated elasticsearch from logstash in bootstrap_lxc scr...