[trunk] Optimization to avoid resolving ScaffoldLocations many times
[trunk] Optimization to avoid resolving ScaffoldLocations many times

markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation