LPS-49364 Fallback logic - use the MasterLayoutSetBranch
LPS-49364 Switch the order - when layoutSetBranchId > 0 the userId isn't used at all
LPS-49364 SF - in this way it is more obvious we do not want to return null only valid layout revisions or exceptions