Revert from _mapping/field due to https://github.com/elasticsearch/elasticsearch/issues/5177 . Updated fields service and proxies
Merge pull request #980 from rashidkpc/master

Revert from _mapping/field to _mapping
Merge remote branch 'upstream/master'