MariaDB 10 Replication support

MariaDB 10 Replication support
Merge branch 'develop' into feature-MX-98
Merge from feature-MAX-98

Merge from feature-MAX-98