Update the Framework DI Container to the latest version. No BC breaks.
Merge pull request #2377 from dongilbert/UpdateDICode

Update the Framework DI Container to the latest version. No BC breaks.
Fix weblink and newsfeed edit for markup changes.