Fix upstream for trusty to build from develop branch