Added support for custom Java App layouts.
Addressed code review comments.
Fixed unit tests.
Addressed code review comments.
Merge pull request #1485 from menivaitsi/java-layout-fix

Added support for custom Java App layouts.