Merge remote-tracking branch 'origin/feature/6709_custom_usage'
Merge remote-tracking branch 'origin/feature/6725_git_macro_fixes'
Rename LeBailFit2 to LeBailFit.  Refs #6745.

Rename LeBailFit2 to LeBailFit.
Set version of LeBailFit to 1.
Remove LeBailFit2 files.  Refs #6745.

Remove the original files.
Merge branch 'feature/6745_rename_lebailfit' into develop