Squashed commit of the following:

commit 7078a2c31946b5ef4ef60c17331df678ef8a6fcf
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 14:20:22 2013 -0700

    Fix issue with user console after merge from maint/3.2/testing.

commit 70d5b08a5d78d01f3cf8527fe4fadb3ca7a3d986
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 11:45:23 2013 -0700

    Fix compilation error after merge from 3.2

commit 854509c9dbab60ef79acb07f5433f4087ac5714c
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 14:12:37 2013 -0700

    Apparently I need to persist the entry as well
    EUCA-5508

commit 6ff9712254f00cd107565a39c32b740bb077533d
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 10:01:40 2013 -0700

    Use VmInstance instead of VmBootRecord for upgrade
    EUCA-5508

commit ecbea6e10ed5f20e5590816f6f65ff635073c7d2
Author: chuck <chuck@eucalyptus.com>
Date:   Fri Mar 22 11:35:19 2013 -0700

    Fix issue where new DB field isn't being upgraded properly
    EUCA-5508
    Conflicts:

    	clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmBootRecord.java

commit bae522803b85a866352e271a1af01814eb2ac44e
Author: mmunn1 <mmunn1@eucalyptus.com>
Date:   Thu Mar 7 13:09:06 2013 -0800

    EUCA-5033 Cannot detach "root" EBS volume from stopped instance

commit a5feecbc9013ec7381dd49a154b96183e2915ae2
Merge: 8f9154c 90896d3
Author: chuck <chuck@eucalyptus.com>
Date:   Thu Mar 28 11:16:32 2013 -0700

    Merge branch 'maint/3.2/testing' into dev/chuck/merge32

    Conflicts:
    	configure
    	console/eucaconsole/__init__.py

commit 90896d3085292d56da037619dc0771e192bc7b01
Author: chris grzegorczyk <grze@eucalyptus.com>
Date:   Wed Mar 27 15:37:03 2013 -0700

    Fix to walrus service lookup EUCA-5554

commit cc656f8d0a334862d9fd03525f0fb89445a183c0
Author: Swathi Gangisetty <swathi@eucalyptus.com>
Date:   Mon Mar 25 22:12:42 2013 -0700

    Fixes EUCA-5463: iSCSI Perl scripts fail to work if hostname is used instead of IP address for the SAN.

    Modified regex in iscsitarget_common.pl to parse hostname/IP address from iSCSI session information

commit 4e768b4548f7fdf75933aa2be3fe25dbf382d5cf
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:38 2013 -0700

    Revert "EUCA-5033 Cannot detach "root" EBS volume from stopped instance"

    This reverts commit 6e174aa21a6f6d37b635c1ae410160fe7f5cfae3.

commit 6238971286a1c238c200e3c84d3bc0e89a873270
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:27 2013 -0700

    Revert "Fix issue where new DB field isn't being upgraded properly"

    This reverts commit 88177bb7cc0025f8486c2a0e7bd260ef4e8270dc.

commit a16ecc942b269ecce62cc416362b7a7a41c26612
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:04:16 2013 -0700

    Revert "Use VmInstance instead of VmBootRecord for upgrade"

    This reverts commit 374e153ea54da820d1a29f2efec16d465ddee2b7.

commit bca7175dc4c0ecce22cce346e5d60a348134b69a
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 26 12:03:44 2013 -0700

    Revert "Apparently I need to persist the entry as well"

    This reverts commit 282b39cdef7f32b6ade5b4f3f07ce99171c2f898.

commit 282b39cdef7f32b6ade5b4f3f07ce99171c2f898
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 14:12:37 2013 -0700

    Apparently I need to persist the entry as well
    EUCA-5508

commit 374e153ea54da820d1a29f2efec16d465ddee2b7
Author: chuck <chuck@eucalyptus.com>
Date:   Mon Mar 25 10:01:40 2013 -0700

    Use VmInstance instead of VmBootRecord for upgrade
    EUCA-5508

commit 88177bb7cc0025f8486c2a0e7bd260ef4e8270dc
Author: chuck <chuck@eucalyptus.com>
Date:   Fri Mar 22 11:35:19 2013 -0700

    Fix issue where new DB field isn't being upgraded properly
    EUCA-5508

commit 25df506bea203d65938f020db5441f74f56b8830
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 16:16:49 2013 -0700

    Run autoconf on configure.ac
    EUCA-644

commit 0f28259fcfb2e1df59ab34a7dc608297ab416b29
Merge: 0583c3b 96a0560
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 10:21:36 2013 -0700

    Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20

commit 96a0560c7125fb02296b510e987cc59a4a33b9fb
Author: chuck <chuck@eucalyptus.com>
Date:   Wed Mar 20 10:12:10 2013 -0700

    Add CFLAGS to flag list.
    EUCA-644

commit 3926c8a6d62cbac38dec634fec135408f5cb7c3c
Merge: 6040200 90c94b5
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 23:34:00 2013 -0700

    Merge branch 'dev/chuck/EUCA-644' into maint/3.2/testing

commit 90c94b5d64c708ce46ce766f918a1efa7175170b
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 23:32:00 2013 -0700

    Fix CFLAGS in AC rather than in configure
    EUCA-644

commit 0583c3b8fec0ed0f6e3babdf3f012b2d0f57b60f
Merge: 6c36713 b3f050b
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 18:12:17 2013 -0700

    Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20

commit 6c36713d5876a22ac8c07a693ef2c17e0b1a7aa1
Author: chuck <chuck@eucalyptus.com>
Date:   Tue Mar 19 18:09:36 2013 -0700

    Fixes issues where VBR sizes aren't properly set
    EUCA-5454

commit 6040200731ce296ff0f26a56cd24121544fff7a0
Author: dkavanagh <dkavanagh@gmail.com>
Date:   Tue Mar 19 15:50:44 2013 -0400

    EUCA-5450
    corrected version in about dialog