Merge pull request #789 from lukapor/master

properties store option fixed
Revert "properties store option fixed"
Merge pull request #790 from elasticsearch/revert-789-master

Revert "properties store option fixed"