More cleanup and documentation prior to stabilization branch for r5
Authored by: m0slevin 2016-11-19
Parent: [r390]
Child: [r392]