Refactoring certificate handling part
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/test/java/org/fogbowcloud/manager/xmpp/util/ManagerTestHelper.java