[ceph/f20] (2 commits) ...revert to old spec until after f21 branch

[Kaleb S. KEITHLEY]

Summary of changes:

  ed8d9af... temporary exclude f21/armv7hl. N.B. it builds fine on f20/a (*)
  9a1331d... revert to old spec until after f21 branch (*)

(*) This commit already existed in another branch; no separate mail sent