Finish alignment on Nuxeo 5.9 and ElasticSearch 1.0.1