Pgustafs 1099456

This to support RFE: https://bugzilla.redhat.com/show_bug.cgi?id=1099456
/Peter

**TODO**
- [x] Get tests to pass.
- [x] Get 100% test coverage on new code.
This line is missing coverage.