Bug fixes

Bug 950711 - Apps taking longer than 120s fail to restore; bump to 200s to cover the few apps affected.

Bug 951994 - Underlying ruby selinux library appears to be unstable.  Rewrite to call the command line.