Fixes for several bugzilla tickets

https://github.com/openshift/li/pull/941