Merge 1.0.02_a into 1.0.02_b

Conflicts:
	TestApp-Ear/src/main/application/test-branch-b.properties