Amending [13091308] to always apply status, closeprobability, and estimatedclose template context regardless if an account or contact context was also found.
Merge branch '2.0' into topic-opportunity-products