Fixed #656: AgaviToolkit::expandVariables replacing is too greedy
merge de7fa980dfd925b7f9639ea1345d49416e5cfee9