Minor fixes
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0

Conflicts:
	meta-common/src/main/java/com/stratio/meta/common/utils/StringUtils.java
	meta-connector-maven-plugin/src/main/resources/UnixScriptTemplate.st
	meta-core/src/main/java/com/stratio/meta2/core/metadata/MetadataManager.java
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0