Cleaned up packaging, based on the work in f26 and master
    
    This basically contains the same clean-up as done in master and f26,
    but does not change building against mbed TLS; it can keep OpenSSL.
    
    Resolves: rhbz#1435831, rhbz#1435036, rhbz#850257
    Reference commits: f3d0d5131fc25dff2, a9b2582ae9cdb91