Use expand_path where appropriate (closes #12556)