Merge "1. Fixed bug "Shift + Replay in test case editor isn't recorded" - added new parameter "metaKeys" for "click" command."
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml
index a9a00c9..7a8b07c 100644
--- a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml
@@ -17,7 +17,7 @@
          point="org.eclipse.rcptt.launching.testEngine">
       <testEngine
             class="org.eclipse.rcptt.zephyr.ZephyrService"
-            parameters="baseUrl*, username*, password*, project*, version*, cycle*"
+            parameters="baseUrl*, username*, password*"
             id="zephyr"
             name="Zephyr">
       </testEngine>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java
index 810d2e3..55fa76e 100644
--- a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java
@@ -24,6 +24,7 @@
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.eclipse.equinox.security.storage.StorageException;
 import org.eclipse.rcptt.tesla.core.TeslaFeatures;
+import org.eclipse.rcptt.tesla.core.utils.Cryptography;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.prefs.BackingStoreException;
 
@@ -185,7 +186,7 @@
 	public static String getZephyrPassword() {
 		final ISecurePreferences preferences = getSecurePreferences();
 		try {
-			return preferences.get(ZEPHYR_PASSWORD, "");
+			return Cryptography.INSTANCE.decrypt(preferences.get(ZEPHYR_PASSWORD, ""));
 		} catch (final StorageException e) {
 			throw new IllegalStateException(
 					MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_PASSWORD), e);
@@ -195,7 +196,7 @@
 	public static void setZephyrPassword(final String password) {
 		final ISecurePreferences preferences = getSecurePreferences();
 		try {
-			preferences.put(ZEPHYR_PASSWORD, password, true);
+			preferences.put(ZEPHYR_PASSWORD, Cryptography.INSTANCE.encrypt(password), false);
 			preferences.flush();
 		} catch (final StorageException | IOException e) {
 			throw new IllegalStateException(