Assorted review rework changes for multiple CIS support implementation commits. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>