Ensure that the shelf being edited belongs to the active operator (bug 1105042)
Merge pull request #11 from mozilla/1105042

Ensure that the shelf being edited belongs to the active operator (bug 1105042)