merge 2.11.1 changes into 2.11

app/edge/components/groups-datatable/groupsDatatable.html

@@ -79,9 +79,7 @@
               <td colspan="4" class="text-center text-muted">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="4" class="text-center text-muted">
-                No Edge group available.
-              </td>
+              <td colspan="4" class="text-center text-muted"> No Edge group available. </td>
             </tr>
           </tbody>
         </table>
@@ -91,9 +89,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>