RF-13582: refactor org.richfaces