Makes staging pluging Factory agnostic.
Merge pull request #202 from aplanas/master

Makes staging pluging Factory agnostic.