improve convert-477-options script, #24047
fix log contexts, RT#30238