Enable builds without sourcing workspace-rc for jenkins
Make build work on trunk again