Fix the properties reading bug
Reformat manager.java
Reformat manager java pre merge
Merge with dev and nossh