PIVOT-895, PIVOT-912, for Jenkins build jobs (both for 2.0.x maintenance branch, and for trunk 2.1.0)