Move db1048 into m3 as future lvm snapshot slave for phabricator.
Combine m2 boxes db1020 and db1046 into same role::mariadb::misc.

Change-Id: I8690de0003d290ff70df41b8a8250309021e610a