Merge pull request #209 from e-cuellar/master

Fix for BISERVER-9522
Fix for BISERVER-9292
Some labels not in modeler.properties