Try renaming scheme on the off-chance that fixes Jenkins
Correct runtime search paths to account for new product name
Merge branch 'test-for-jenkins' into v2.x-beta