Revert "Backport change from r115807 in Emacs trunk"

This reverts commit c2ed678f20f7a4deccc3373c6a226163d5624cc8.
Merge branch 'maint'
Backport r115828 from Emacs trunk
Merge branch 'maint'
ob-clojure.el (org-babel-clojure-backend): Use 'cider when available

* ob-clojure.el (org-babel-clojure-backend): Use 'cider as the
backend when available.  Fall back on nrepl when available and
on slime otherwise.
ox: Convert Japanese translation from utf-8 to default

* lisp/ox.el (org-export-dictionary): Convert all Japanese translation
  from utf-8 to default.

There shouldn't be much need for exporters and users to worry about
the coding system of the final output.  If one wants to export a
"Japanese" document, he should already have the document with Japanese
capable coding system. In that case, Emacs should be able to handle
the coding system conversion form the translation table to the
designated file coding system.

There are two cases which I can think don't work:

  - all words in the document are written in romaji, and one wants
    romaji translations

  - the documents are writ en in a language which does not support
    Japanese character set, ie English or French, and one wants to use
    Japanese for non-content strings, ie TOC.

These cases are too rare that we can ignore for now.
ox: Add new Japanese translation strings

* lisp/ox.el (org-export-dictionary): Add new Japanese translation
  strings.

A few strings in `org-export-dictionary' didn't have Japanese
translations.  So, I just added.
org.el (org-entry-put): Check that the value provided is a string

* org.el (org-entry-put): Check that the value provided is a
string.  If it is nil, convert it to the empty string.
Merge branch 'maint'
Merge branch 'master' of orgmode.org:org-mode
org.el (org-do-emphasis-faces): Fix false positives handling

* org.el (org-do-emphasis-faces): Handle false positives by
restarting the re-search one char after the beginning of the
match, not one char before its ending.

Before this fix, consider this buffer

** Headline
  - *Bold* non-bold
  - *Bold* non-bold

The first false positive is "** Headline\n  - *Bold*"

Starting the search again from the last "*" will skip
the "*Bold*" string.  Starting again at "* Headline" will
find it.
Merge branch 'maint'
org-agenda.el (org-cmp-ts): Fix bug

* org-agenda.el (org-cmp-ts): Fix bug: interpret `late' as
`later than any date' instead of `later than today'.

Thank to Michael Crouch for reporting this and to Michael Hoffman for
providing the fix.
Merge branch 'maint'
ob-lob.el: Minor custom and docstring fixes

* ob-lob.el (org-babel-lob-files): Fix custom type.
(org-babel-lob-ingest): Small docstring fix.

Thanks to Glenn Morris for reporting them.
Merge branch 'maint'
org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log

* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log.  Otherwise throw an error.
Merge branch 'maint'
Updated org-index.el to Version 2.4
Small updates to org-index.el