Update to Solr 6.4.0#17

rbuchmann wants to merge 2 commits into

mwmitchell:mastermwmitchell/flux:masterfrom

rbuchmann:masterrbuchmann/flux:masterCopy head branch name to clipboard