This is a new attempt at !1283 (merged), also introducing a check on successful deployment to CVMFS to prevent the havoc caused by the failure connected with !1283 (merged).