[css-align] Markup fixes, better linking, specify how to resolve a conflict between self and content baseline alignment on the same box.

--HG--
extra : rebase_source : de45114ffa146314fa1f97f7a4c8eba53dfbeed4