CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network

(cherry picked from commit 4dcc5671d17bd96feacda0c1999bf1e9a64f530e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/components-api/src/com/cloud/network/IpAddressManager.java
	server/src/com/cloud/network/IpAddressManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
CLOUDSTACK-5997: Template state changes side affects

(cherry picked from commit 0e2e6995b7ae92c253c1fcea0d7e3fb93689f827)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/template/HypervisorTemplateAdapter.java

This makes setup/db/db/schema-421to430.sql same as in master branch. The
change is table view related and does not affect db at all. Making it same
as the version on master for sanity purposes.