Fixes for final release commits and merging to develop

Signed-off-by: Mike Stallard <mstallard@pivotallabs.com>