VIVO-439, VIVO-507, VIVO-509, VIVO-512
KLUGE — ignore the broken test until Tim can deal with it on Monday.
Merge branch 'maint-rel-1.6' into develop