touch-ups in php and solrconfig
merged