Fixes XNAT-2801, XNAT-2934 Fixes several project validation corner cases.