Merge remote-tracking branch 'upstream/master'

Conflicts:
	beans/pom.xml
	beans/src/main/java/webui/tests/CloudifyTestBean.java
	beans/src/main/java/webui/tests/CloudifyTestBeanImpl.java
	beans/src/main/java/webui/tests/CloudifyTestBeanMock.java
	beans/src/main/java/webui/tests/cloudify/commands/CloudifyCliManager.java
	beans/src/main/java/webui/tests/pages/LoginPage.java
	beans/src/test/java/webui/tests/ApplicationsUninstallTest.java
	beans/src/test/resources/example-context.xml