* test_neutron_added
 * RELEASE_UBUNTU added to settings.py

Change-Id: Ic1c2b6c2f9254096fbabdd66b68583131ff53ecc
Merge " * test_neutron_added  * RELEASE_UBUNTU added to settings.py"