BZ-1168472 - Build & Deploy button is a drop down with only Build on it

(cherry picked from commit c718f74b70848cb90bee140fab26ee36317d0f6a)