Merging apache fixes 4/22/2014

various bug-quality fixes being brought over