The template for the system VM is Wheezy 7 not Wheezy 7.0 on XenServer 6.4.99

(cherry picked from commit 612b4ae6d9588bceca38b8022d017cb93aae2673)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
CLOUDSTACK-6075: Increase the ram size for router service offering

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488c17858f17f548d907cd72df54e0abdfd439b2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-7412: Can't create proper template from VM on S3 secondary storage environment

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
CLOUDSTACK-7320: Added default CentOS 7 template for LXC

Conflicts:
	setup/db/db/schema-442to450.sql