[uml] bump to 2.6.30.4, apply fix from [15119] to x86_64