Merge pull request #1781 from apache/tristan/release-cleanups

Various cleanups in order to address issues with initial apache release