fix #3737: improve handling of protected/not protected cache fields
ref #6190 removing svn property place holder in first line of code - java files
ref #5305 Refactored combo elements