Merge branch 'pwdchange' into 'master'

Whoops. menu_navigation does not get cleaned up because of extra space in sql

which causes the bootstrap to fail.

See merge request !328

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -350,7 +350,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
 
 
 	private static void deleteMenu(String menupath) {
 	private static void deleteMenu(String menupath) {
 		dbUpdates.add(new String[] {
 		dbUpdates.add(new String[] {
-				"delete from menu_navigation where item_id in (select id from menuitem where url in ( ' " + menupath + "'))",
+				"delete from menu_navigation where item_id in (select id from menuitem where url in ( '" + menupath + "'))",
 				"delete from menuitem where url in ('" + menupath + "')",
 				"delete from menuitem where url in ('" + menupath + "')",
 		});
 		});
 	}
 	}