Fix db upgrade path conflict, add 4.15.1.0->4.16.0.0 for master, bump systemvmtemplate version to 4.16. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>