Fixed #732: AgaviToolkit::expandVariables replacing is too greedy