This is a preliminary step to CMIS server selection simplification.

Change-Id: I74f333a9f233bbaabb4d6b6ba48fb8e86df2f508