Merge "Update-config simulator prop. with mvn assembly."