mysql_multi_instance : lint cleanup

Change-Id: Id36f8ad8621124fa9751129a53c77c520ed22214
Merge "mysql_multi_instance : lint cleanup" into production