Merge change 4147 into donut

* changes:
  On the way of refactoring out SingleServerProfile.java.