Fix packaging for F19 and F20 and for those two in Docker image

Change-Id: I3d25b75b14256f2e54836cf518aef3ddab7b22dd
Signed-off-by: Martin Sivak <msivak@redhat.com>