The existing supported special tokens are "GlobalProperty:", "UserProperty:", and "SessionAttribute:". I think this should be consistently-cased with those, e.g. "SystemDefault".

Also, you'd ned to document this new behavior in the javadoc for the method.