Bundle tweaks to avoid mysql installs on deployment systems