CLOUDIFY-2393 added support for optimistic locking in elasticsearch storage; update now uses 1 upsert call instead of querying before update
CLOUDIFY-2393 merge commit
Merge branch 'develop' into feature/CLOUDIFY-2393-Storage-Impl-Phase-2
small refactor to node put call
Merge pull request #171 from CloudifySource/feature/CLOUDIFY-2393-Storage-Impl-Phase-2

Feature/cloudify 2393 storage impl phase 2