Reverted parent build to centos6, and moved mariadb settings add to later
Merge remote-tracking branch 'origin/DEV'