Merge changes I06179fca,Ie48746c8,Ia47ebc95

* changes:
  Disable turbine for unbundled builds
  Allow disabling turbine
  Simplify the *-lib-* functions