Merge "Fixed LP bug 991806. Ensures that floating IP created in test is destroyed in a finally: block"