Include standard for the new mariadb roles.
Remove duplicate includes added previously to node definitions.

Change-Id: I5610eae10a0a0a8b30b6cf10390d27c58b606ad8