update to 2.3.1-mer5
Release mer-2.3.1-mer6

Signed-off-by: David Greaves <david@dgreaves.com>
Release mer-2.3.1-7