Final clean up for move to upstream mysql cookbook with osl-mysql