Final update to OPENVPMS-1172

Signed-off-by: benjamincharlton <benjicharlton@gmail.com>