Branch b1_6

Exit on 'make sources' failure so that the rest of the build fails at the
correct time.

b=13026
i=mjmac
i=brian