Good catch! 

Please run 16_cf-serverd acceptance tests now that #1528 is merged, so that all these changes are tested.