TILES-436 TILES-466 Merge from trunk to TILES_2_1_X branch. Fixed portlet integration and added sample portlet in "tiles-test" webapp.