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.
The comment on this test and the option it is testing for are both different than the name of the test. Please make sure comments, tests, and test names are in agreement.