kepler
Migrate to WFS-NG
Fix up libs again after update from frank

I expect we are in an edit war here frank.