Renamed local variables "from_collections_context".
Renamed local variables "from_collections_context".

Made them singular: "from_collection_contest" to match struct name.  These
were missed when the struct was renamed.

donmccaughey/libsf,donmccaughey/libsf