Updated puppetlabs-mysql to support mariadb

Change-Id: I38de999d5358f5fc0904a65827618afb20ffa86b
Fixes: rhbz#981116
Changed nmap-ncat to nc

Installing nmap-ncat does not work for RHEL. Installing nc works both for RHEL and Fedora

Conflicts:
	packstack/plugins/puppet_950.py

Change-Id: I46e244ba941ad64033da978c71925ce893637ffb
Merge "Changed nmap-ncat to nc" into grizzly