CLOUDIFY-1405 add template fails on secured byon cloud.
CLOUDIFY-1405 add template fails on secured byon cloud.

Conflicts:
	CLI/src/main/java/org/cloudifysource/shell/commands/AddTemplates.java
	CLI/src/main/resources/MessagesBundle.properties
	restful/src/main/java/org/cloudifysource/rest/controllers/ServiceController.java
Backport NPE fix from 2.5.0
Merge pull request #27 from itaifrenkel/2_3_1

backport of CLOUDIFY-1405 from 2.5.0