Switch to CAF develop branch again.

After having resolved the endless importer loop in 730b868, we can (and should :-)
use again the development version of CAF.