Removed unnecessary parts in "if X and X" boolean tests, thanks to Guido Pelzer.
Removed unnecessary parts in "if X and X" boolean tests, thanks to
Guido Pelzer.

inveniosoftware/invenio,tiborsimko/invenio,inveniosoftware/invenio,tiborsimko/invenio