MethodExpression wrapping of vdl.retargetMethodExpression does not take into account #{cc} resolution

On vdl.retargetMethodExpression, it is done something like this to "retarget" methodExpressions:

if (CompositeComponentELUtils.isCompositeComponentExpression(attributeExpressionString))

{ methodExpression = new ValueExpressionMethodExpression(attributeNameValueExpression); }

This strategy causes problems when complex EL expressions are resolved.

I think it is better to "unwrap" the original expression, trying to find LocationValueExpression wrappers and "rewrap" the method expression to be created with a LocationMethodExpression. In this way, complex EL expressions are resolved correctly.

I did some tests and it works well. Minor fixes were included with this patch too.