Bdp milestone2 mergetest

Merged mytardis/3.0 into bdp-milestone2. Notably fixes a new deployment error once pyparsing was updated by its developers (broken dependency).