Issue #2229195 by lsolesen: Prepared for adding upgrade tests on Travis