Merge "Remove configstore from compatibility_matrix.5.xml" into rvc-dev