Fix for travis ci and outofsource build
Merge remote-tracking branch 'ocelot/stable' into stable
Fix buildbot errors (associated with libiberty).