This reverts commit 0ef5a518.

Christian Ehrhardt authored Oct 16, 2017 and Ondrej Sury committed Nov 22, 2017

New tests were added along work for but those are still failing on
s390x. To pass dep8, but not skip on unittests entirely this disables
the particular test on s390x.

[1]: https://jira.mariadb.org/browse/MDEV-13412



Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Upstream version 10.1.29

# gpg: Signature made Thu 16 Nov 2017 03:15:09 PM UTC
# gpg:                using RSA key C361B1E3029543EBC625E97D8372A477EFAE59C2
# gpg: Good signature from "Ondřej Surý <ondrej@sury.org>" [ultimate]
# gpg:                 aka "Ondřej Surý <ondrej@debian.org>" [ultimate]
# gpg:                 aka "Ondřej Surý <ondrej@isc.org>" [ultimate]
# Primary key fingerprint: 30B9 33D8 0FCE 3D98 1A2D  38FB 0C99 B70E F4FC BB07
#      Subkey fingerprint: C361 B1E3 0295 43EB C625  E97D 8372 A477 EFAE 59C2

Upstream version 10.1.28

# gpg: Signature made 2017-10-09T18:48:48 UTC
# gpg:                using RSA key 30B933D80FCE3D981A2D38FB0C99B70EF4FCBB07
# gpg: Good signature from "Ondřej Surý <ondrej@sury.org>" [ultimate]
# gpg:                 aka "[jpeg image of size 3934]" [ultimate]
# gpg:                 aka "Ondřej Surý <ondrej@debian.org>" [ultimate]
# gpg:                 aka "Ondřej Surý <ondrej.sury@nic.cz>" [ultimate]
# Primary key fingerprint: 30B9 33D8 0FCE 3D98 1A2D  38FB 0C99 B70E F4FC BB07

Upstream version 10.1.26

Explicitly add dh_systemd_start snippets to mariadb-server-10.1 because it's all messed up with different name for sysvinit ('mysql') and systemd ('mariadb') (Closes: #865870)

Upstream version 10.1.25