updated nfs inline with bootstrap changes (wip)
Merge remote-tracking branch 'origin/next' into sqlite
updated nfs
Merge remote-tracking branch 'origin/next' into sqlite
cleanup
Removed #include for unavailable Routing file.
Merge remote-tracking branch 'origin/next' into sqlite
Trivial update.
Merge remote-tracking branch 'origin/next' into sqlite