I'm pretty sure "Man at arms" is gone however, with the change of skills to different categories like offense, defense, naughty things etc.
I might be wrong on that.
And yes, as stated, the calculation is done IN ORDER OF THE MOUSEOVER.
So if it says x... +10%... +x the last x isn't calculated in, just the first x.
Why some bonusses are placed after and some before is something only Larian can tell us however.