Credentials from credentials store not being used if credentials are in the URL

As a side effect the fix for #1010 (closed), if the content source URL has embedded credentials (which could be fake credentials like git@), the credentials from the credentials store is never used. This is not the intended behavior. The credentials from the credentials store should always be consulted as a fallback. This change was inadvertent.