Added mock build support for origin builds
Additional release build fixes for origin