Merge branch 'develop-shruti' into TEST

Conflicts:
	site-common/statistics/src/main/resources/META-INF/persistence.xml

site-portal/directtransport-portlet/src/main/resources/environment.devel
opment-madur.properties

site-portal/directtransport-portlet/src/main/resources/environment.devel
opment-shruti.properties

site-portal/directtransport-portlet/src/main/resources/environment.devel
opment.properties