try to fix lua compile in unitsync
fix merge-conflict (wtf?)
Merge branch 'develop' of github.com:spring/spring into develop
add safeguards for #3752