Between 6.1.2.5 and 6.1.3.5, there are many changes made in the code and default config. Changes include:
1. CSD override / Single chain legacy option is by default enabled from 6.1.3.2 code.
2. Changes mande for Non-Wi-Fi interference immunity feature in 6.1.3.2
3. Suppress ARP and broadcast filter arp features are by default enabled from 6.1.3.2
4. Changes in WMS config from 6.1.3.2
5. SW Retry is renamed to Temporal Diversity
Apart from this few more changes made on CLI as well. Considering all these differences, IMO, you should avoid such code differeces on master and local.