SAK-20449 improved rwiki macros


git-svn-id: https://source.sakaiproject.org/svn/rwiki/trunk@120998 66ffb92e-73f9-0310-93c1-f5514f145a0a