Feature/collector plugin improvements

Probably should refrain from using the project name in the code.  The name may change again when it gets accepted into OpenStack