I am sending this patch again without changes to rspec tests
suggested by rwsu in
https://lists.fedorahosted.org/pipermail/aeolus-devel/2012-July/011544.html
I have created
https://www.aeolusproject.org/redmine/issues/3583 for myself to refactor
tests later.