Merge changes If5b48838,I1a530ed9

* changes:
  Upgrade joda-time to 2.8
  Upgrade Lucene to version 5.2.1