Clean up usage of current_folder and loaded_folder

Refs #9970.
Merge branch 'feature/9970_refactor_project_serialisation' into develop