Merge pull request #3177 from openscholar/custom-domain-pin

Fix possible variable issue when private files form is save
Merge branch 'SCHOLAR-3.6' into remove-tasks