Merge "FunctionalMenuRole class DB constraints"