Adding test data to allow merging/replacing tests.
Adding merge/replace data in load test data script.
Improving test data.
updated docs for package generation.
Adding conf entry for seeding lockfile timeout.
Merge branch 'master' of https://github.com/EOX-A/ngeo-b_autotest

Conflicts:
	HOWTO