Avoided another potential conflict for stream migrations
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop